X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmodules-load%2Fmodules-load.c;h=c77b092a628b3599a03dca0ff7160ee205a1a888;hp=ecb84da6d733efdab36f2827a415a38284f6cea1;hb=601185b43da638b1c74153deae01dbd518680889;hpb=75cd513ef830d8e00d0d2d6a64917fec533315db diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index ecb84da6d..c77b092a6 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -181,15 +181,12 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent return r; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" "Loads statically configured kernel modules.\n\n" " -h --help Show this help\n" " --version Show package version\n", program_invocation_short_name); - - return 0; } static int parse_argv(int argc, char *argv[]) { @@ -209,12 +206,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); @@ -227,7 +225,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; }