Bring bootchart code in line with CODING_STYLE

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

diff --git a/src/notify/notify.c b/src/notify/notify.c
index ffc8dfeb9b79d71b8a36872080229494cf5eaf45..a145b8fd1b7caf75defda64749d15e4742724f06 100644 (file)
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -34,6 +34,7 @@
 #include "log.h"
 #include "sd-readahead.h"
 #include "build.h"
+#include "env-util.h"
 
 static bool arg_ready = false;
 static pid_t arg_pid = 0;
@@ -76,7 +77,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "status",    required_argument, NULL, ARG_STATUS    },
                 { "booted",    no_argument,       NULL, ARG_BOOTED    },
                 { "readahead", required_argument, NULL, ARG_READAHEAD },
-                { NULL,        0,                 NULL, 0             }
+                {}
         };
 
         int c;
@@ -89,12 +90,10 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 case 'h':
-                        help();
-                        return 0;
+                        return help();
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -130,8 +129,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");
                 }
         }
 
@@ -157,7 +155,8 @@ int main(int argc, char* argv[]) {
         log_parse_environment();
         log_open();
 
-        if ((r = parse_argv(argc, argv)) <= 0) {
+        r = parse_argv(argc, argv);
+        if (r <= 0) {
                 retval = r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
                 goto finish;
         }