diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-05 13:22:18 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-19 13:50:38 +0100 |
| commit | eaa1f2574629425c0e66225d5e387734cde087c6 (patch) | |
| tree | 09f07442ba8b3f73ad492bbe6ff1a2a0075fb187 /bus/services.c | |
| parent | 0f309ae984ca27f06dea2588716711db3a5be434 (diff) | |
| download | dbus-eaa1f2574629425c0e66225d5e387734cde087c6.tar.gz | |
bus_registry_acquire_service: remove unnecessary variable
Diffstat (limited to 'bus/services.c')
| -rw-r--r-- | bus/services.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bus/services.c b/bus/services.c index 0a049257..68a7022a 100644 --- a/bus/services.c +++ b/bus/services.c @@ -385,7 +385,6 @@ bus_registry_acquire_service (BusRegistry *registry, { dbus_bool_t retval; DBusConnection *old_owner_conn; - DBusConnection *current_owner_conn; BusClientPolicy *policy; BusService *service; BusActivation *activation; @@ -510,12 +509,10 @@ bus_registry_acquire_service (BusRegistry *registry, primary_owner = bus_service_get_primary_owner (service); if (primary_owner == NULL) goto out; - - current_owner_conn = primary_owner->conn; - + if (old_owner_conn == NULL) { - _dbus_assert (current_owner_conn == connection); + _dbus_assert (primary_owner->conn == connection); *result = DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER; } |