From 4654e558a3c297a71f05c3b2db6a2744fcf3cdea Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 18 Mar 2013 20:31:21 -0400
Subject: logind: exploit previous cleanups and simplify returns

---
 src/login/inhibit.c | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

(limited to 'src/login/inhibit.c')

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index e94843be7f..9cb321fc8f 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -64,7 +64,7 @@ static int inhibit(DBusConnection *bus, DBusError *error) {
         if (!dbus_message_get_args(reply, error,
                                    DBUS_TYPE_UNIX_FD, &r,
                                    DBUS_TYPE_INVALID))
-                r = -EIO;
+                return -EIO;
 
         return r;
 }
@@ -85,27 +85,21 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         NULL,
                         DBUS_TYPE_INVALID);
         if (r < 0)
-                goto finish;
+                return r;
 
-        if (!dbus_message_iter_init(reply, &iter)) {
-                r = -ENOMEM;
-                goto finish;
-        }
+        if (!dbus_message_iter_init(reply, &iter))
+                return -ENOMEM;
 
-        if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) {
-                r = -EIO;
-                goto finish;
-        }
+        if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
+                return -EIO;
 
         dbus_message_iter_recurse(&iter, &sub);
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
                 const char *what, *who, *why, *mode;
                 dbus_uint32_t uid, pid;
 
-                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
-                        r = -EIO;
-                        goto finish;
-                }
+                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT)
+                        return -EIO;
 
                 dbus_message_iter_recurse(&sub, &sub2);
 
@@ -114,10 +108,8 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &why, true) < 0 ||
                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &mode, true) < 0 ||
                     bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &uid, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &pid, false) < 0) {
-                        r = -EIO;
-                        goto finish;
-                }
+                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &pid, false) < 0)
+                        return -EIO;
 
                 printf("     Who: %s (UID %lu, PID %lu)\n"
                        "    What: %s\n"
@@ -134,10 +126,7 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
         }
 
         printf("%u inhibitors listed.\n", n);
-        r = 0;
-
-finish:
-        return r;
+        return 0;
 }
 
 static int help(void) {
@@ -240,7 +229,7 @@ int main(int argc, char *argv[]) {
         int r, exit_code = 0;
         DBusConnection *bus = NULL;
         DBusError error;
-        int fd = -1;
+        int _cleanup_close_ fd = -1;
 
         dbus_error_init(&error);
 
@@ -313,8 +302,5 @@ finish:
 
         dbus_error_free(&error);
 
-        if (fd >= 0)
-                close_nointr_nofail(fd);
-
         return r < 0 ? EXIT_FAILURE : exit_code;
 }
-- 
cgit v1.2.3-54-g00ecf