summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorRuediger Meier2017-06-20 20:30:29 +0200
committerRuediger Meier2017-06-26 14:38:24 +0200
commitfa2cd89aca82d14943133c76763c04ae430d5dc7 (patch)
treebc3977de825e8ede02da1fddcc6543ffce447ca1 /sys-utils
parentmisc: never use usage(stderr) (diff)
downloadkernel-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>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/nsenter.c8
-rw-r--r--sys-utils/unshare.c8
2 files changed, 8 insertions, 8 deletions
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;