X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Flibsystemd%2Fsd-bus%2Fsd-bus.c;h=dc54e211a490b3918a400bc7c8eebfa5a0da780f;hb=93f1bcf40030a9e98bf2b71c177cbea36c64d5c9;hp=bbe61a6a8f8ae2c8870b0059aeffcae47c0fe407;hpb=374c356979ba7222fa7e09005824fe6996b0e91e;p=elogind.git diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index bbe61a6a8..dc54e211a 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -3065,7 +3065,7 @@ _public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) { bus->event_priority = priority; - r = sd_event_add_monotonic(bus->event, &bus->time_event_source, 0, 0, time_callback, bus); + r = sd_event_add_time(bus->event, &bus->time_event_source, CLOCK_MONOTONIC, 0, 0, time_callback, bus); if (r < 0) goto fail; @@ -3106,9 +3106,7 @@ _public_ int sd_bus_detach_event(sd_bus *bus) { bus->quit_event_source = sd_event_source_unref(bus->quit_event_source); } - if (bus->event) - bus->event = sd_event_unref(bus->event); - + bus->event = sd_event_unref(bus->event); return 1; } @@ -3268,7 +3266,7 @@ _public_ int sd_bus_get_peer_creds(sd_bus *bus, uint64_t mask, sd_bus_creds **re assert_return(ret, -EINVAL); assert_return(!bus_pid_changed(bus), -ECHILD); - if (!bus->is_kernel) + if (bus->is_kernel) return -ENOTSUP; if (!BUS_IS_OPEN(bus->state))