projects
/
platform
/
upstream
/
dbus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0f309ae
)
bus_registry_acquire_service: remove unnecessary variable
author
Simon McVittie
<simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 12:22:18 +0000
(13:22 +0100)
committer
Simon McVittie
<simon.mcvittie@collabora.co.uk>
Mon, 19 Sep 2011 12:50:38 +0000
(13:50 +0100)
bus/services.c
patch
|
blob
|
history
diff --git
a/bus/services.c
b/bus/services.c
index
0a04925
..
68a7022
100644
(file)
--- 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;
}