diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-31 20:56:29 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-31 20:56:29 +0000 |
| commit | fa05de9230d62e7c427b5313796fc6ccd4d0ff60 (patch) | |
| tree | 206890e8df6a575c150b901bf108b1c0a1e98824 /bus/services.c | |
| parent | 7af59334331fbd097a24c4942c75181882b96747 (diff) | |
| download | dbus-fa05de9230d62e7c427b5313796fc6ccd4d0ff60.tar.gz | |
2003-03-31 Havoc Pennington <hp@redhat.com>
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
Diffstat (limited to 'bus/services.c')
| -rw-r--r-- | bus/services.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/bus/services.c b/bus/services.c index d3ab1e59..8d4221fb 100644 --- a/bus/services.c +++ b/bus/services.c @@ -107,13 +107,10 @@ BusService* bus_registry_lookup (BusRegistry *registry, const DBusString *service_name) { - const char *c_name; BusService *service; - - _dbus_string_get_const_data (service_name, &c_name); service = _dbus_hash_table_lookup_string (registry->service_hash, - c_name); + _dbus_string_get_const_data (service_name)); return service; } @@ -125,18 +122,15 @@ bus_registry_ensure (BusRegistry *registry, BusTransaction *transaction, DBusError *error) { - const char *c_name; BusService *service; _DBUS_ASSERT_ERROR_IS_CLEAR (error); _dbus_assert (owner_if_created != NULL); _dbus_assert (transaction != NULL); - - _dbus_string_get_const_data (service_name, &c_name); service = _dbus_hash_table_lookup_string (registry->service_hash, - c_name); + _dbus_string_get_const_data (service_name)); if (service != NULL) return service; @@ -149,8 +143,7 @@ bus_registry_ensure (BusRegistry *registry, service->registry = registry; - service->name = _dbus_strdup (c_name); - if (service->name == NULL) + if (!_dbus_string_copy_data (service_name, &service->name)) { _dbus_mem_pool_dealloc (registry->service_pool, service); BUS_SET_OOM (error); |