clients: unify how we invoke getopt_long()

[elogind.git] / src / activate / activate.c

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 83d25b13af9063e4c875c95e51b48c4e160644fd..43ab458812708ec8e749c0d506833b380cab2c47 100644 (file)
--- 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) {