chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'b39a2770ba55637da80e2e389222c59dbea73507'
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-match.c
diff --git
a/src/libsystemd/sd-bus/bus-match.c
b/src/libsystemd/sd-bus/bus-match.c
index b868159b5c8233fd49e30650d3d74fe15f40e306..9e0769caa63dc08e6fa36f5f3f2ecc1802c2b477 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-match.c
+++ b/
src/libsystemd/sd-bus/bus-match.c
@@
-289,17
+289,16
@@
int bus_match_run(
return r;
/* Run the callback. And then invoke siblings. */
return r;
/* Run the callback. And then invoke siblings. */
- if (node->leaf.callback) {
- sd_bus_slot *slot;
-
+ if (node->leaf.callback->callback) {
_cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
_cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
+ sd_bus_slot *slot;
slot = container_of(node->leaf.callback, sd_bus_slot, match_callback);
if (bus)
slot = container_of(node->leaf.callback, sd_bus_slot, match_callback);
if (bus)
- bus->current_slot = s
lot
;
+ bus->current_slot = s
d_bus_slot_ref(slot)
;
r = node->leaf.callback->callback(bus, m, slot->userdata, &error_buffer);
if (bus)
r = node->leaf.callback->callback(bus, m, slot->userdata, &error_buffer);
if (bus)
- bus->current_slot =
NULL
;
+ bus->current_slot =
sd_bus_slot_unref(slot)
;
r = bus_maybe_reply_error(m, r, &error_buffer);
if (r != 0)
r = bus_maybe_reply_error(m, r, &error_buffer);
if (r != 0)