clients: unify how we invoke getopt_long()

[elogind.git] / src / ask-password / ask-password.c

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 238cf12080777e86cb700cde6874302f2dc6a9dd..ea0c62397e4f64a3bc74142b0851cc4c9129b973 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -81,7 +81,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "no-tty",        no_argument,       NULL, ARG_NO_TTY        },
                 { "accept-cached", no_argument,       NULL, ARG_ACCEPT_CACHED },
                 { "multiple",      no_argument,       NULL, ARG_MULTIPLE      },
                 { "no-tty",        no_argument,       NULL, ARG_NO_TTY        },
                 { "accept-cached", no_argument,       NULL, ARG_ACCEPT_CACHED },
                 { "multiple",      no_argument,       NULL, ARG_MULTIPLE      },

-                { NULL,            0,                 NULL, 0                 }
+                {}

         };
 
         int c;
         };
 
         int c;


@@ -94,8 +94,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 case 'h':
                 switch (c) {
 
                 case 'h':

-                        help();
-                        return 0;
+                        return help();

 
                 case ARG_ICON:
                         arg_icon = optarg;
 
                 case ARG_ICON:
                         arg_icon = optarg;


@@ -124,8 +123,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");

                 }
         }
 
                 }
         }