chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove src/initctl
[elogind.git]
/
src
/
machine-id-commit
/
machine-id-commit.c
diff --git
a/src/machine-id-commit/machine-id-commit.c
b/src/machine-id-commit/machine-id-commit.c
index c7e4de8889323cb62feaa0c63faa54a25d280967..0f7748e453542454fe071ae994962efbab98535e 100644
(file)
--- a/
src/machine-id-commit/machine-id-commit.c
+++ b/
src/machine-id-commit/machine-id-commit.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <getopt.h>
#include <stdlib.h>
#include <stdio.h>
#include <getopt.h>
@@
-29,7
+28,7
@@
#include "log.h"
#include "build.h"
#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"
static void help(void) {
printf("%s [OPTIONS...]\n\n"
@@
-99,7
+98,10
@@
int main(int argc, char *argv[]) {
r = parse_argv(argc, argv);
if (r <= 0)
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;
}
}