diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-11-06 18:28:39 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-11-06 18:28:39 +0100 |
| commit | eb9da376d76b48585b3b63b4f91903b54f7abd36 (patch) | |
| tree | f58957844d6248d2df547727a4bfbd1b81c2ef97 /src/cgls | |
| parent | 4087cb9e8fb90957d90d577e62e8ba056c2258cf (diff) | |
clients: unify how we invoke getopt_long()
Among other things this makes sure we always expose a --version command
and show it in the help texts.
Diffstat (limited to 'src/cgls')
| -rw-r--r-- | src/cgls/cgls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index c689b5c471..b8e275d013 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -42,7 +42,7 @@ static bool arg_all = false; static int arg_full = -1; static char* arg_machine = NULL; -static void help(void) { +static int help(void) { printf("%s [OPTIONS...] [CGROUP...]\n\n" "Recursively show control group contents.\n\n" @@ -54,6 +54,8 @@ static void help(void) { " -k Include kernel threads in output\n" " -M --machine Show container\n", program_invocation_short_name); + + return 0; } static int parse_argv(int argc, char *argv[]) { @@ -70,7 +72,7 @@ static int parse_argv(int argc, char *argv[]) { { "all", no_argument, NULL, 'a' }, { "full", no_argument, NULL, 'l' }, { "machine", required_argument, NULL, 'M' }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -83,8 +85,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); @@ -115,8 +116,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; default: - log_error("Unknown option code %c", c); - return -EINVAL; + assert_not_reached("Unhandled option"); } } |