diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-02-15 00:23:06 +0300 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-02-15 00:23:06 +0300 |
commit | 67991cf824f8df27e74c92d754fb507681c69ce6 (patch) | |
tree | a0b652f3dc794d1050c1a8de3afb014a621238fa /util-linux/dmesg.c | |
parent | 68be2ab914e1e20fe666bbd22a89a18714be2789 (diff) |
This patch, put together by Manuel Novoa III, is a merge of work
done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.
Diffstat (limited to 'util-linux/dmesg.c')
-rw-r--r-- | util-linux/dmesg.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index c21f84c9a..47f9f4474 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -53,21 +53,21 @@ int dmesg_main(int argc, char **argv) case 'n': cmd = 8; if (optarg == NULL) - usage(dmesg_usage); + show_usage(); level = atoi(optarg); break; case 's': if (optarg == NULL) - usage(dmesg_usage); + show_usage(); bufsize = atoi(optarg); break; default: - usage(dmesg_usage); + show_usage(); } } if (optind < argc) { - goto end; + show_usage(); } if (cmd == 8) { @@ -97,7 +97,4 @@ int dmesg_main(int argc, char **argv) if (lastc != '\n') putchar('\n'); return EXIT_SUCCESS; - end: - usage(dmesg_usage); - return EXIT_FAILURE; } |