diff options
author | Ruediger Meier | 2017-06-20 20:30:29 +0200 |
---|---|---|
committer | Ruediger Meier | 2017-06-26 14:38:24 +0200 |
commit | fa2cd89aca82d14943133c76763c04ae430d5dc7 (patch) | |
tree | bc3977de825e8ede02da1fddcc6543ffce447ca1 | |
parent | misc: never use usage(stderr) (diff) | |
download | kernel-qcow2-util-linux-fa2cd89aca82d14943133c76763c04ae430d5dc7.tar.gz kernel-qcow2-util-linux-fa2cd89aca82d14943133c76763c04ae430d5dc7.tar.xz kernel-qcow2-util-linux-fa2cd89aca82d14943133c76763c04ae430d5dc7.zip |
misc: cosmetics, remove argument from usage(int)
This patch is trivial and changes nothing, because
we were always using usage(0).
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
-rw-r--r-- | misc-utils/blkid.c | 8 | ||||
-rw-r--r-- | sys-utils/nsenter.c | 8 | ||||
-rw-r--r-- | sys-utils/unshare.c | 8 | ||||
-rw-r--r-- | text-utils/column.c | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index 52179e5e1..f4757e8c8 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -68,9 +68,9 @@ static void print_version(FILE *out) LIBBLKID_VERSION, LIBBLKID_DATE); } -static void usage(int error) +static void __attribute__((__noreturn__)) usage(void) { - FILE *out = error ? stderr : stdout; + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _( " %s --label <label> | --uuid <uuid>\n\n"), program_invocation_short_name); @@ -106,7 +106,7 @@ static void usage(int error) fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("blkid(8)")); - exit(error); + exit(EXIT_SUCCESS); } /* @@ -794,7 +794,7 @@ int main(int argc, char **argv) /* ignore - backward compatibility */ break; case 'h': - usage(0); + usage(); break; default: errtryhelp(EXIT_FAILURE); diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 6ad0b0fe0..204e6ce3b 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -65,9 +65,9 @@ static struct namespace_file { { .nstype = 0, .name = NULL, .fd = -1 } }; -static void __attribute__((__noreturn__)) usage(int status) +static void __attribute__((__noreturn__)) usage(void) { - FILE *out = status == EXIT_SUCCESS ? stdout : stderr; + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] [<program> [<argument>...]]\n"), @@ -101,7 +101,7 @@ static void __attribute__((__noreturn__)) usage(int status) fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("nsenter(1)")); - exit(status); + exit(EXIT_SUCCESS); } static pid_t namespace_target_pid = 0; @@ -253,7 +253,7 @@ int main(int argc, char *argv[]) longopts, NULL)) != -1) { switch (c) { case 'h': - usage(EXIT_SUCCESS); + usage(); case 'V': printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c index 80fa0d356..d3973527b 100644 --- a/sys-utils/unshare.c +++ b/sys-utils/unshare.c @@ -238,9 +238,9 @@ static void bind_ns_files_from_child(pid_t *child, int fds[2]) } } -static void __attribute__((__noreturn__)) usage(int status) +static void __attribute__((__noreturn__)) usage(void) { - FILE *out = status == EXIT_SUCCESS ? stdout : stderr; + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] [<program> [<argument>...]]\n"), @@ -269,7 +269,7 @@ static void __attribute__((__noreturn__)) usage(int status) fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("unshare(1)")); - exit(status); + exit(EXIT_SUCCESS); } int main(int argc, char *argv[]) @@ -321,7 +321,7 @@ int main(int argc, char *argv[]) forkit = 1; break; case 'h': - usage(EXIT_SUCCESS); + usage(); case 'V': printf(UTIL_LINUX_VERSION); return EXIT_SUCCESS; diff --git a/text-utils/column.c b/text-utils/column.c index 1144ef87a..7f956f721 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -546,9 +546,9 @@ static void simple_print(struct column_control *ctl) } } -static void __attribute__((__noreturn__)) usage(int rc) +static void __attribute__((__noreturn__)) usage(void) { - FILE *out = rc == EXIT_FAILURE ? stderr : stdout; + FILE *out = stdout; fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options] [<file>...]\n"), program_invocation_short_name); @@ -585,7 +585,7 @@ static void __attribute__((__noreturn__)) usage(int rc) fputs(USAGE_VERSION, out); fprintf(out, USAGE_MAN_TAIL("column(1)")); - exit(rc); + exit(EXIT_SUCCESS); } int main(int argc, char **argv) @@ -657,7 +657,7 @@ int main(int argc, char **argv) ctl.tab_colhide = optarg; break; case 'h': - usage(EXIT_SUCCESS); + usage(); break; case 'i': ctl.tree_id = optarg; |