From 6e1eda6f229f87b77471ce6eb7cbf0ede7c8029e Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 19 Jun 2017 20:52:50 +0200 Subject: misc: never use usage(stderr) Here we fix all cases where we have usage(FILE*) functions. Signed-off-by: Ruediger Meier --- text-utils/col.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'text-utils') diff --git a/text-utils/col.c b/text-utils/col.c index bac48e7e3..a473e55fb 100644 --- a/text-utils/col.c +++ b/text-utils/col.c @@ -124,8 +124,9 @@ static int pass_unknown_seqs; /* whether to pass unknown control sequences */ if (putwchar(ch) == WEOF) \ wrerr(); -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); @@ -149,7 +150,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) program_invocation_short_name); fprintf(out, USAGE_MAN_TAIL("col(1)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } static void __attribute__((__noreturn__)) wrerr(void) @@ -221,13 +222,15 @@ int main(int argc, char **argv) printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'H': - usage(stdout); + usage(); default: errtryhelp(EXIT_FAILURE); } - if (optind != argc) - usage(stderr); + if (optind != argc) { + warnx(_("bad usage")); + errtryhelp(EXIT_FAILURE); + } adjust = cur_col = extra_lines = warned = 0; cur_line = max_line = nflushd_lines = this_line = 0; -- cgit v1.2.3-55-g7522