chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
80caea6
)
bus: don't generate assert warnings when we detach a detached bus from an event
author
Lennart Poettering
<lennart@poettering.net>
Tue, 10 Dec 2013 23:06:50 +0000
(23:06 +0000)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 10 Dec 2013 23:06:50 +0000
(23:06 +0000)
src/libsystemd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index 91fac4815e8f28018b84aac694ba475995ef139c..0a2ce3eb8dda1efc48af91a189e4315fda52f898 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-2645,7
+2645,9
@@
fail:
_public_ int sd_bus_detach_event(sd_bus *bus) {
assert_return(bus, -EINVAL);
- assert_return(bus->event, -ENXIO);
+
+ if (!bus->event)
+ return 0;
if (bus->input_io_event_source) {
sd_event_source_set_enabled(bus->input_io_event_source, SD_EVENT_OFF);
@@
-2670,7
+2672,7
@@
_public_ int sd_bus_detach_event(sd_bus *bus) {
if (bus->event)
bus->event = sd_event_unref(bus->event);
- return
0
;
+ return
1
;
}
_public_ sd_event* sd_bus_get_event(sd_bus *bus) {