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/chcpu.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/chcpu.c')
| -rw-r--r-- | sys-utils/chcpu.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c index 30afa457c..c0f568073 100644 --- a/sys-utils/chcpu.c +++ b/sys-utils/chcpu.c @@ -232,8 +232,9 @@ static void cpu_parse(char *cpu_string, cpu_set_t *cpu_set, size_t setsize) errx(EXIT_FAILURE, _("failed to parse CPU list: %s"), cpu_string); } -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; fprintf(out, _( "\nUsage:\n" " %s [options]\n"), program_invocation_short_name); @@ -251,7 +252,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) " -r, --rescan trigger rescan of cpus\n" " -V, --version output version information and exit\n")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } int main(int argc, char *argv[]) @@ -316,7 +317,7 @@ int main(int argc, char *argv[]) cpu_parse(argv[optind - 1], cpu_set, setsize); break; case 'h': - usage(stdout); + usage(); case 'p': if (strcmp("horizontal", argv[optind - 1]) == 0) cmd = CMD_CPU_DISPATCH_HORIZONTAL; @@ -337,8 +338,10 @@ int main(int argc, char *argv[]) } } - if ((argc == 1) || (argc != optind)) - usage(stderr); + if ((argc == 1) || (argc != optind)) { + warnx(_("bad usage")); + errtryhelp(EXIT_FAILURE); + } switch (cmd) { case CMD_CPU_ENABLE: |