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/ipcrm.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/ipcrm.c')
-rw-r--r-- | sys-utils/ipcrm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c index 5b71f7d81..a60919d9b 100644 --- a/sys-utils/ipcrm.c +++ b/sys-utils/ipcrm.c @@ -44,8 +44,9 @@ typedef enum type_id { static int verbose = 0; /* print the usage */ -static void __attribute__ ((__noreturn__)) usage(FILE * out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %1$s [options]\n" " %1$s shm|msg|sem <id>...\n"), program_invocation_short_name); @@ -68,7 +69,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("ipcrm(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } static int remove_id(int type, int iskey, int id) @@ -158,7 +159,7 @@ static int deprecated_main(int argc, char **argv) if (argc < 3) { warnx(_("not enough arguments")); - usage(stderr); + errtryhelp(EXIT_FAILURE); } if (remove_arg_list(type, argc - 2, &argv[2])) @@ -401,7 +402,7 @@ int main(int argc, char **argv) verbose = 1; break; case 'h': - usage(stdout); + usage(); case 'V': printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; |