unit: rework trigger dependency logic

[elogind.git] / src / login / inhibit.c

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 9cb321fc8fb1e7cc8d329decdb3d2617a3de409e..fe108c6ef011c088ea403af089e5a12d25f91106 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -229,7 +229,7 @@ int main(int argc, char *argv[]) {
         int r, exit_code = 0;
         DBusConnection *bus = NULL;
         DBusError error;
-        int _cleanup_close_ fd = -1;
+        _cleanup_close_ int fd = -1;
 
         dbus_error_init(&error);
 
@@ -251,7 +251,7 @@ int main(int argc, char *argv[]) {
 
                 r = print_inhibitors(bus, &error);
                 if (r < 0) {
-                        log_error("Failed to list inhibitors: %s", bus_error_message_or_strerror(&error, -r));
+                        log_error("Failed to list inhibitors: %s", bus_error(&error, r));
                         goto finish;
                 }
 
@@ -266,7 +266,7 @@ int main(int argc, char *argv[]) {
                 free(w);
 
                 if (fd < 0) {
-                        log_error("Failed to inhibit: %s", bus_error_message_or_strerror(&error, -r));
+                        log_error("Failed to inhibit: %s", bus_error(&error, r));
                         r = fd;
                         goto finish;
                 }