chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clients: unify how we invoke getopt_long()
[elogind.git]
/
src
/
boot
/
bootctl.c
diff --git
a/src/boot/bootctl.c
b/src/boot/bootctl.c
index d25ddef6e5ac7c61d99217b79ad8922060d5cf0c..9387e05d0ea168cd52327debb6fd8cf9f91f31e4 100644
(file)
--- a/
src/boot/bootctl.c
+++ b/
src/boot/bootctl.c
@@
-33,6
+33,7
@@
#include "utf8.h"
static int help(void) {
#include "utf8.h"
static int help(void) {
+
printf("%s [OPTIONS...] COMMAND ...\n\n"
"Query or change firmware and boot manager settings.\n\n"
" -h --help Show this help\n"
printf("%s [OPTIONS...] COMMAND ...\n\n"
"Query or change firmware and boot manager settings.\n\n"
" -h --help Show this help\n"
@@
-52,20
+53,20
@@
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;
assert(argc >= 0);
assert(argv);
};
int c;
assert(argc >= 0);
assert(argv);
+
while ((c = getopt_long(argc, argv, "+hH:P", options, NULL)) >= 0) {
switch (c) {
case 'h':
while ((c = getopt_long(argc, argv, "+hH:P", options, NULL)) >= 0) {
switch (c) {
case 'h':
- help();
- return 0;
+ return help();
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
@@
-76,8
+77,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");
}
}
}
}