run: uninitialized variable

[elogind.git] / src / run / run.c

diff --git a/src/run/run.c b/src/run/run.c
index 05bfc61beb4b34df24e7816b365567af5ec164ba..22abb0ebbbf5ff7167b9be3b3fab93120f6546af 100644 (file)
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -214,7 +214,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'M':
-                        arg_transport = BUS_TRANSPORT_CONTAINER;
+                        arg_transport = BUS_TRANSPORT_MACHINE;
                         arg_host = optarg;
                         break;
 
@@ -423,16 +423,12 @@ static int transient_cgroup_set_properties(sd_bus_message *m) {
 }
 
 static int transient_kill_set_properties(sd_bus_message *m) {
-        int r;
         assert(m);
 
-        if (arg_send_sighup) {
-                r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup);
-                if (r < 0)
-                        return r;
-        }
-
-        return r;
+        if (arg_send_sighup)
+                return sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", arg_send_sighup);
+        else
+                return 0;
 }
 
 static int transient_service_set_properties(sd_bus_message *m, char **argv, const char *pty_path) {
@@ -679,7 +675,7 @@ static int start_transient_service(
                         if (r < 0)
                                 return log_error_errno(r, "Failed to determine tty name: %m");
 
-                } else if (arg_transport == BUS_TRANSPORT_CONTAINER) {
+                } else if (arg_transport == BUS_TRANSPORT_MACHINE) {
                         _cleanup_bus_unref_ sd_bus *system_bus = NULL;
                         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
                         const char *s;