summaryrefslogtreecommitdiff
path: root/src/login/inhibit.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-03-18 14:38:48 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-18 19:59:33 -0400
commitce0fc5f5f6debc6e37ac3ab0a3ea1c9c35b3ed99 (patch)
treeb94ff8a4451a0484ac307ba9f7894f624c21f722 /src/login/inhibit.c
parentc6a818c82035da91e7987920510f0dda61d8781a (diff)
logind: Make more use of cleanup macros
Diffstat (limited to 'src/login/inhibit.c')
-rw-r--r--src/login/inhibit.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index a812195cae..e94843be7f 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -42,7 +42,7 @@ static enum {
} arg_action = ACTION_INHIBIT;
static int inhibit(DBusConnection *bus, DBusError *error) {
- DBusMessage *reply = NULL;
+ _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
int r;
r = bus_method_call_with_reply(
@@ -66,13 +66,11 @@ static int inhibit(DBusConnection *bus, DBusError *error) {
DBUS_TYPE_INVALID))
r = -EIO;
- dbus_message_unref(reply);
-
return r;
}
static int print_inhibitors(DBusConnection *bus, DBusError *error) {
- DBusMessage *reply = NULL;
+ _cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
unsigned n = 0;
DBusMessageIter iter, sub, sub2;
int r;
@@ -139,9 +137,6 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
r = 0;
finish:
- if (reply)
- dbus_message_unref(reply);
-
return r;
}