X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachinectl.c;h=ee802b1e8bd2993774cbe75fbabdc50937845e43;hb=84f6181c2ac99a0514ca5e0c8fc8c8e284caf789;hp=8468436646bf330de1d7309e9ae70219fd9cc128;hpb=9f6eb1cd58f2ddf2eb6ba0e4de056e13d938af75;p=elogind.git

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 846843664..ee802b1e8 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -849,35 +849,29 @@ static int machinectl_main(sd_bus *bus, int argc, char *argv[]) {
 }
 
 int main(int argc, char*argv[]) {
-        int r, ret = EXIT_FAILURE;
         _cleanup_bus_unref_ sd_bus *bus = NULL;
+        int r;
 
         setlocale(LC_ALL, "");
         log_parse_environment();
         log_open();
 
         r = parse_argv(argc, argv);
-        if (r < 0)
+        if (r <= 0)
                 goto finish;
-        else if (r == 0) {
-                ret = EXIT_SUCCESS;
-                goto finish;
-        }
 
         r = bus_open_transport(arg_transport, arg_host, false, &bus);
         if (r < 0) {
                 log_error("Failed to create bus connection: %s", strerror(-r));
-                ret = EXIT_FAILURE;
                 goto finish;
         }
 
         r = machinectl_main(bus, argc, argv);
-        ret = r < 0 ? EXIT_FAILURE : r;
 
 finish:
-        strv_free(arg_property);
-
         pager_close();
 
-        return ret;
+        strv_free(arg_property);
+
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }