chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ptyfwd: Don't set the output prop of stdin, nor the input props of stdout.
[elogind.git]
/
src
/
machine-id-setup
/
machine-id-setup-main.c
diff --git
a/src/machine-id-setup/machine-id-setup-main.c
b/src/machine-id-setup/machine-id-setup-main.c
index 6373ebc2db250f0e355250d5f7dcb2571eaee8a4..84af925f517e9c3b3d39c0f8786355b21c84c8a6 100644
(file)
--- a/
src/machine-id-setup/machine-id-setup-main.c
+++ b/
src/machine-id-setup/machine-id-setup-main.c
@@
-49,7
+49,7
@@
static int parse_argv(int argc, char *argv[]) {
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
- {
NULL, 0, NULL, 0
}
+ {}
};
int c;
};
int c;
@@
-62,12
+62,10
@@
static int parse_argv(int argc, char *argv[]) {
switch (c) {
case 'h':
switch (c) {
case 'h':
- help();
- return 0;
+ return help();
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
puts(SYSTEMD_FEATURES);
return 0;
puts(SYSTEMD_FEATURES);
return 0;
@@
-75,8
+73,7
@@
static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
default:
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
}
}
}