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/connection.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'bus/connection.c') diff --git a/bus/connection.c b/bus/connection.c index ee7d183c..3d83d96c 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -732,20 +732,17 @@ dbus_bool_t bus_connection_set_name (DBusConnection *connection, const DBusString *name) { - const char *c_name; BusConnectionData *d; d = BUS_CONNECTION_DATA (connection); _dbus_assert (d != NULL); _dbus_assert (d->name == NULL); - _dbus_string_get_const_data (name, &c_name); - - d->name = _dbus_strdup (c_name); - - if (d->name == NULL) + if (!_dbus_string_copy_data (name, &d->name)) return FALSE; + _dbus_assert (d->name != NULL); + _dbus_verbose ("Name %s assigned to %p\n", d->name, connection); return TRUE; -- cgit