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/desktop-file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bus/desktop-file.c') diff --git a/bus/desktop-file.c b/bus/desktop-file.c index 13b709d2..08af768e 100644 --- a/bus/desktop-file.c +++ b/bus/desktop-file.c @@ -514,7 +514,7 @@ parse_key_value (BusDesktopFileParser *parser, DBusError *error) return FALSE; } - if (!_dbus_string_init (&key, key_end - key_start)) + if (!_dbus_string_init (&key)) { parser_free (parser); return FALSE; @@ -613,7 +613,7 @@ bus_desktop_file_load (DBusString *filename, return NULL; } - if (!_dbus_string_init (&str, _DBUS_INT_MAX)) + if (!_dbus_string_init (&str)) return NULL; if (!_dbus_file_get_contents (&str, filename, error)) -- cgit