Prep v225: Applying various fixes and changes to src/libelogind/sd-bus that got lost...

[elogind.git] / src / cgroups-agent / cgroups-agent.c

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index d1d843bda71e46bd117f937890e28aa91206fc14..612bc8fdec7ad9f8ca7b8a32ebd27a804108a76e 100644 (file)
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -26,7 +26,7 @@
 #include "bus-util.h"
 
 int main(int argc, char *argv[]) {
-        _cleanup_bus_unref_ sd_bus *bus = NULL;
+        _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL;
         int r;
 
         if (argc != 2) {
@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) {
                 /* If we couldn't connect we assume this was triggered
                  * while systemd got restarted/transitioned from
                  * initrd to the system, so let's ignore this */
-                log_debug("Failed to get D-Bus connection: %s", strerror(-r));
+                log_debug_errno(r, "Failed to get D-Bus connection: %m");
                 return EXIT_FAILURE;
         }
 
@@ -58,11 +58,9 @@ int main(int argc, char *argv[]) {
                                "Released",
                                "s", argv[1]);
         if (r < 0) {
-                log_debug("Failed to send signal message on private connection: %s", strerror(-r));
+                log_debug_errno(r, "Failed to send signal message on private connection: %m");
                 return EXIT_FAILURE;
         }
 
-        sd_bus_flush(bus);
-
         return EXIT_SUCCESS;
 }