From fa05de9230d62e7c427b5313796fc6ccd4d0ff60 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 31 Mar 2003 20:56:29 +0000 Subject: 2003-03-31 Havoc Pennington Fix some annoying DBusString API and fix all affected code. * dbus/dbus-string.c (_dbus_string_init): get rid of annoying max_length argument (_dbus_string_get_data): change to return string instead of using an out param (_dbus_string_get_const_data): ditto (_dbus_string_get_data_len): ditto (_dbus_string_get_const_data_len): ditto --- bus/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bus/main.c') diff --git a/bus/main.c b/bus/main.c index ae625489..fcde3493 100644 --- a/bus/main.c +++ b/bus/main.c @@ -51,10 +51,8 @@ check_two_config_files (const DBusString *config_file, { if (_dbus_string_get_length (config_file) > 0) { - const char *s; - _dbus_string_get_const_data (config_file, &s); fprintf (stderr, "--%s specified but configuration file %s already requested\n", - extra_arg, s); + extra_arg, _dbus_string_get_const_data (config_file)); exit (1); } } @@ -68,7 +66,7 @@ main (int argc, char **argv) const char *prev_arg; int i; - if (!_dbus_string_init (&config_file, _DBUS_INT_MAX)) + if (!_dbus_string_init (&config_file)) return 1; prev_arg = NULL; -- cgit