summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-11-15 16:30:24 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-11-15 16:30:24 +0100
commitf72daa64dcfa73c8427663be53d49393e0cbb343 (patch)
tree3e1154e30ff19597227e5ccde4a3629d9937f28c
parent645a9e5a2bbb06464a3fba1a3501e9d79e5bbad8 (diff)
dbus-manager: modernize style
-rw-r--r--src/core/dbus-manager.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 3cf3e90a36..262e5ffef4 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -740,7 +740,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (r < 0)
return bus_send_error_reply(connection, message, &error, r);
- if (!(reply = dbus_message_new_method_return(message)))
+ reply = dbus_message_new_method_return(message);
+ if (!reply)
goto oom;
} else if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "GetJob")) {
@@ -1358,7 +1359,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!e)
goto oom;
- if (!(reply = dbus_message_new_method_return(message))) {
+ reply = dbus_message_new_method_return(message);
+ if (!reply) {
strv_free(e);
goto oom;
}
@@ -1410,7 +1412,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!f)
goto oom;
- if (!(reply = dbus_message_new_method_return(message))) {
+ reply = dbus_message_new_method_return(message);
+ if (!reply) {
strv_free(f);
goto oom;
}