From 86be6a32d3fd229dbb17bf5e3348a01e6e6e855a Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Tue, 20 Jun 2017 20:20:29 +0200 Subject: misc: cosmetics, remove argument from usage(FILE*) This patch is trivial and changes nothing, because we were always using usage(stdout) Now all our usage() functions look very similar. If wanted we could auto-generate another big cosmetical patch to remove all the useless "FILE *out" constants and use printf and puts rather than their f* friends. Such patch could be automatically synchronized with the translation project (newlines!) to not make the translators sick. Signed-off-by: Ruediger Meier --- misc-utils/kill.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'misc-utils/kill.c') diff --git a/misc-utils/kill.c b/misc-utils/kill.c index 9046d76d1e..ecee26c4ed 100644 --- a/misc-utils/kill.c +++ b/misc-utils/kill.c @@ -296,8 +296,9 @@ static int arg_to_signum(char *arg, int maskbit) return signame_to_signum(arg); } -static void __attribute__((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] |...\n"), program_invocation_short_name); @@ -321,7 +322,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("kill(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } static char **parse_arguments(int argc, char **argv, struct kill_control *ctl) @@ -345,7 +346,7 @@ static char **parse_arguments(int argc, char **argv, struct kill_control *ctl) exit(EXIT_SUCCESS); } if (!strcmp(arg, "-h") || !strcmp(arg, "--help")) - usage(stdout); + usage(); if (!strcmp(arg, "--verbose")) { ctl->verbose = 1; continue; -- cgit 1.2.3-korg