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 --- dbus/dbus-address.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'dbus/dbus-address.c') diff --git a/dbus/dbus-address.c b/dbus/dbus-address.c index 5effe4d1..d3099222 100644 --- a/dbus/dbus-address.c +++ b/dbus/dbus-address.c @@ -97,7 +97,7 @@ create_entry (void) if (entry == NULL) return NULL; - if (!_dbus_string_init (&entry->method, _DBUS_INT_MAX)) + if (!_dbus_string_init (&entry->method)) { dbus_free (entry); return NULL; @@ -116,11 +116,7 @@ create_entry (void) const char * dbus_address_entry_get_method (DBusAddressEntry *entry) { - const char *method; - - _dbus_string_get_const_data (&entry->method, &method); - - return method; + return _dbus_string_get_const_data (&entry->method); } /** @@ -144,12 +140,8 @@ dbus_address_entry_get_value (DBusAddressEntry *entry, _dbus_assert (values != NULL); if (_dbus_string_equal_c_str (keys->data, key)) - { - const char *str; + return _dbus_string_get_const_data (values->data); - _dbus_string_get_const_data (values->data, &str); - return str; - } keys = _dbus_list_get_next_link (&entry->keys, keys); values = _dbus_list_get_next_link (&entry->values, values); } @@ -268,7 +260,7 @@ dbus_parse_address (const char *address, goto error; } - if (!_dbus_string_init (key, _DBUS_INT_MAX)) + if (!_dbus_string_init (key)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); dbus_free (key); @@ -277,7 +269,7 @@ dbus_parse_address (const char *address, goto error; } - if (!_dbus_string_init (value, _DBUS_INT_MAX)) + if (!_dbus_string_init (value)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); _dbus_string_free (key); -- cgit