diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-02 11:12:21 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-03 21:46:07 -0400 |
| commit | 601185b43da638b1c74153deae01dbd518680889 (patch) | |
| tree | b4f1bc609e57e542a03ca00553098eabbb3b196b /src/journal-remote | |
| parent | 75cd513ef830d8e00d0d2d6a64917fec533315db (diff) | |
Unify parse_argv style
getopt is usually good at printing out a nice error message when
commandline options are invalid. It distinguishes between an unknown
option and a known option with a missing arg. It is better to let it
do its job and not use opterr=0 unless we actually want to suppress
messages. So remove opterr=0 in the few places where it wasn't really
useful.
When an error in options is encountered, we should not print a lengthy
help() and overwhelm the user, when we know precisely what is wrong
with the commandline. In addition, since help() prints to stdout, it
should not be used except when requested with -h or --help.
Also, simplify things here and there.
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-gatewayd.c | 8 | ||||
| -rw-r--r-- | src/journal-remote/journal-remote.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 6cfe22957a..db81fe3ca3 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -857,8 +857,7 @@ static int request_handler( return mhd_respond(connection, MHD_HTTP_NOT_FOUND, "Not found.\n"); } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] ...\n\n" "HTTP server for journal events.\n\n" " -h --help Show this help\n" @@ -867,8 +866,6 @@ static int help(void) { " --key=KEY.PEM Server key in PEM format\n" " --trust=CERT.PEM Certificat authority certificate in PEM format\n", program_invocation_short_name); - - return 0; } static int parse_argv(int argc, char *argv[]) { @@ -898,7 +895,8 @@ static int parse_argv(int argc, char *argv[]) { switch(c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 1df178691a..c8e3c235ac 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1370,8 +1370,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unknown option code."); } if (optind < argc) |