diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-09-10 09:38:49 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-10 09:38:49 +0200 |
| commit | 3137e0bd5290fea67e52cfe7ff657c3af400b548 (patch) | |
| tree | be69e8e3857913887df1e39b51922fbc755c865a /src/login | |
| parent | 680258b112e8a78769a42abb71ada4981ce701e1 (diff) | |
dbus: minor coding style fixes
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/inhibit.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 62a8223e63..08a4701161 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; |