From eb9da376d76b48585b3b63b4f91903b54f7abd36 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Nov 2013 18:28:39 +0100 Subject: 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. --- src/activate/activate.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/activate') diff --git a/src/activate/activate.c b/src/activate/activate.c index 83d25b13af..43ab458812 100644 --- a/src/activate/activate.c +++ b/src/activate/activate.c @@ -336,7 +336,7 @@ static int parse_argv(int argc, char *argv[]) { { "listen", required_argument, NULL, 'l' }, { "accept", no_argument, NULL, 'a' }, { "environment", required_argument, NULL, 'E' }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -347,8 +347,7 @@ static int parse_argv(int argc, char *argv[]) { while ((c = getopt_long(argc, argv, "+hl:saE:", options, NULL)) >= 0) switch(c) { case 'h': - help(); - return 0 /* done */; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); @@ -379,8 +378,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"); } if (optind == argc) { -- cgit v1.2.3-54-g00ecf