diff options
| author | Ruediger Meier | 2017-06-19 20:52:50 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-26 14:38:24 +0200 |
| commit | 6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e (patch) | |
| tree | 5e74a0cd99493e934780db2b434c75e995a6bd17 /sys-utils/lscpu.c | |
| parent | misc: never use usage(ERROR) (diff) | |
| download | kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.tar.gz kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.tar.xz kernel-qcow2-util-linux-6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e.zip | |
misc: never use usage(stderr)
Here we fix all cases where we have usage(FILE*)
functions.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'sys-utils/lscpu.c')
| -rw-r--r-- | sys-utils/lscpu.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 2871f7131..2504da2e0 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -2044,8 +2044,9 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod) scols_unref_table(tb); } -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; size_t i; fputs(USAGE_HEADER, out); @@ -2074,7 +2075,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fprintf(out, USAGE_MAN_TAIL("lscpu(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } int main(int argc, char *argv[]) @@ -2130,7 +2131,7 @@ int main(int argc, char *argv[]) cpu_modifier_specified = 1; break; case 'h': - usage(stdout); + usage(); case 'J': mod->json = 1; break; @@ -2173,8 +2174,10 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - if (argc != optind) - usage(stderr); + if (argc != optind) { + warnx(_("bad usage")); + errtryhelp(EXIT_FAILURE); + } /* set default cpu display mode if none was specified */ if (!mod->online && !mod->offline) { |