machine-id-commit: simplifications

This commit is contained in:
Lennart Poettering 2015-03-10 18:56:56 +01:00
parent f85ef957e6
commit d9dde2bb03

View File

@ -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;
}