sd-resolve: rework sd-resolve to be callback based, similar in style to sd-bus and...

[elogind.git] / src / libsystemd / sd-bus / sd-bus.c

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 3929b351e23fcf516ce9487348fb5c4ebb8747f4..dc54e211a490b3918a400bc7c8eebfa5a0da780f 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -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);
         }
 
                 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;
 }
 
         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);
 
         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))
                 return -ENOTSUP;
 
         if (!BUS_IS_OPEN(bus->state))