diff options
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/inhibit.c | 15 | ||||
| -rw-r--r-- | src/login/loginctl.c | 15 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 24e8fb04bd..02b6b25751 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -122,8 +122,7 @@ static int print_inhibitors(sd_bus *bus, sd_bus_error *error) { return 0; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Execute a process while inhibiting shutdown/sleep/idle.\n\n" " -h --help Show this help\n" @@ -135,10 +134,8 @@ static int help(void) { " --who=STRING A descriptive string who is inhibiting\n" " --why=STRING A descriptive string why is being inhibited\n" " --mode=MODE One of block or delay\n" - " --list List active inhibitors\n", - program_invocation_short_name); - - return 0; + " --list List active inhibitors\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -168,12 +165,13 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -206,7 +204,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } if (arg_action == ACTION_INHIBIT && argc == 1) arg_action = ACTION_LIST; diff --git a/src/login/loginctl.c b/src/login/loginctl.c index ebe9c1f16c..1773276b95 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -1047,8 +1047,7 @@ static int terminate_seat(sd_bus *bus, char **args, unsigned n) { return 0; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Send control commands to or query the login manager.\n\n" " -h --help Show this help\n" @@ -1086,10 +1085,8 @@ static int help(void) { " show-seat NAME... Show properties of one or more seats\n" " attach NAME DEVICE... Attach one or more devices to a seat\n" " flush-devices Flush all device associations\n" - " terminate-seat NAME... Terminate all sessions on one or more seats\n", - program_invocation_short_name); - - return 0; + " terminate-seat NAME... Terminate all sessions on one or more seats\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -1123,12 +1120,13 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hp:als:H:M:", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hp:als:H:M:", options, NULL)) >= 0) switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -1195,7 +1193,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; } |