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 --- sys-utils/wdctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys-utils/wdctl.c') diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c index 1790e8993..28a24c1f8 100644 --- a/sys-utils/wdctl.c +++ b/sys-utils/wdctl.c @@ -165,8 +165,9 @@ static struct colinfo *get_column_info(unsigned num) return &infos[ get_column_id(num) ]; } -static void __attribute__ ((__noreturn__)) usage(FILE *out) +static void __attribute__((__noreturn__)) usage(void) { + FILE *out = stdout; size_t i; fputs(USAGE_HEADER, out); @@ -201,7 +202,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out) fprintf(out, USAGE_MAN_TAIL("wdctl(8)")); - exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + exit(EXIT_SUCCESS); } static void add_flag_line(struct libscols_table *table, struct wdinfo *wd, const struct wdflag *fl) @@ -531,7 +532,7 @@ int main(int argc, char *argv[]) printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; case 'h': - usage(stdout); + usage(); case 'F': noflags = 1; break; -- cgit v1.2.3-55-g7522