[systemd-commits] 2 commits - src/login src/shared

[Lennart Poettering]

 src/login/inhibit.c      |   20 +++++++++-----------
 src/shared/dbus-common.c |   11 +++++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 3137e0bd5290fea67e52cfe7ff657c3af400b548
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Sep 10 09:38:49 2012 +0200

    dbus: minor coding style fixes

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 62a8223..08a4701 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -43,9 +43,9 @@ static enum {
 
 static int inhibit(DBusConnection *bus, DBusError *error) {
         DBusMessage *reply = NULL;
-        int fd;
+        int r;
 
-        fd = bus_method_call_with_reply (
+        r = bus_method_call_with_reply(
                         bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
@@ -58,17 +58,17 @@ static int inhibit(DBusConnection *bus, DBusError *error) {
                         DBUS_TYPE_STRING, &arg_why,
                         DBUS_TYPE_STRING, &arg_mode,
                         DBUS_TYPE_INVALID);
-        if (fd)
-                return fd;
+        if (r < 0)
+                return r;
 
         if (!dbus_message_get_args(reply, error,
-                                   DBUS_TYPE_UNIX_FD, &fd,
+                                   DBUS_TYPE_UNIX_FD, &r,
                                    DBUS_TYPE_INVALID))
-                fd = -EIO;
+                r = -EIO;
 
         dbus_message_unref(reply);
 
-        return fd;
+        return r;
 }
 
 static int print_inhibitors(DBusConnection *bus, DBusError *error) {
@@ -77,7 +77,7 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
         DBusMessageIter iter, sub, sub2;
         int r;
 
-        r = bus_method_call_with_reply (
+        r = bus_method_call_with_reply(
                         bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
@@ -86,10 +86,8 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         &reply,
                         NULL,
                         DBUS_TYPE_INVALID);
-        if (r) {
-                r = -ENOMEM;
+        if (r < 0)
                 goto finish;
-        }
 
         if (!dbus_message_iter_init(reply, &iter)) {
                 r = -ENOMEM;
@@ -110,7 +108,6 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                "UID",
                "PID");
 
-
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
                 const char *what, *who, *why, *mode;
                 char *ewho, *ewhy;
diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
index 8d7c462..bcbef77 100644
--- a/src/shared/dbus-common.c
+++ b/src/shared/dbus-common.c
@@ -1278,14 +1278,12 @@ int bus_method_call_with_reply(DBusConnection *bus,
         va_start(ap, first_arg_type);
         if (!dbus_message_append_args_valist(m, first_arg_type, ap)) {
                 va_end(ap);
-                dbus_message_unref(m);
                 r = log_oom();
                 goto finish;
         }
         va_end(ap);
 
         reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
-        dbus_message_unref(m);
         if (!reply) {
                 if (!return_error)
                         log_error("Failed to issue method call: %s", bus_error_message(&error));
@@ -1299,13 +1297,18 @@ int bus_method_call_with_reply(DBusConnection *bus,
                         r = -EIO;
                 goto finish;
         }
+
         if (return_reply)
                 *return_reply = reply;
         else
                 dbus_message_unref(reply);
+
 finish:
-        if(return_error)
-                *return_error=error;
+        if (m)
+                dbus_message_unref(m);
+
+        if (return_error)
+                *return_error = error;
         else
                 dbus_error_free(&error);
 

commit 680258b112e8a78769a42abb71ada4981ce701e1
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Sep 7 22:56:35 2012 -0400

    Make systemd-inhibit --list work
    
    The code in the print_inhibitors function had an unintended
    unconditional early exit, causing it to never print any
    inhibitors.

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 029c954..62a8223 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -86,9 +86,10 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         &reply,
                         NULL,
                         DBUS_TYPE_INVALID);
-        if (r)
-                return -ENOMEM;
+        if (r) {
+                r = -ENOMEM;
                 goto finish;
+        }
 
         if (!dbus_message_iter_init(reply, &iter)) {
                 r = -ENOMEM;