From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 10 Mar 2015 17:56:56 +0000 (+0100)
Subject: machine-id-commit: simplifications
X-Git-Tag: v219.0~398
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d9dde2bb03fd2d3b71365909eaa5d0179e2fba86

machine-id-commit: simplifications
---

diff --git a/src/machine-id-commit/machine-id-commit.c b/src/machine-id-commit/machine-id-commit.c
index d9c1b7c7a..0f7748e45 100644
--- a/src/machine-id-commit/machine-id-commit.c
+++ b/src/machine-id-commit/machine-id-commit.c
@@ -28,7 +28,7 @@
 #include "log.h"
 #include "build.h"
 
-static const char *arg_root = "";
+static const char *arg_root = NULL;
 
 static void help(void) {
         printf("%s [OPTIONS...]\n\n"
@@ -98,7 +98,10 @@ int main(int argc, char *argv[]) {
 
         r = parse_argv(argc, argv);
         if (r <= 0)
-                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+                goto finish;
 
-        return machine_id_commit(arg_root) < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+        r = machine_id_commit(arg_root);
+
+finish:
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }