projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003-03-31 Havoc Pennington <hp@redhat.com>
[platform/upstream/dbus.git]
/
bus
/
connection.c
diff --git
a/bus/connection.c
b/bus/connection.c
index
ee7d183
..
3d83d96
100644
(file)
--- a/
bus/connection.c
+++ b/
bus/connection.c
@@
-732,20
+732,17
@@
dbus_bool_t
bus_connection_set_name (DBusConnection *connection,
const DBusString *name)
{
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);
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;
return FALSE;
+ _dbus_assert (d->name != NULL);
+
_dbus_verbose ("Name %s assigned to %p\n", d->name, connection);
return TRUE;
_dbus_verbose ("Name %s assigned to %p\n", d->name, connection);
return TRUE;