summaryrefslogtreecommitdiffstats
path: root/sys-utils
diff options
context:
space:
mode:
authorJ William Piggott2017-06-23 02:32:27 +0200
committerJ William Piggott2017-06-24 19:57:12 +0200
commit6e2d5a4460da45cb120fa198a8102aa6c7a97378 (patch)
treee9daea275bd6d4c327e7b29ca94cd0d401565951 /sys-utils
parentagetty: fix login name DEL/CTRL^U issue (diff)
downloadkernel-qcow2-util-linux-6e2d5a4460da45cb120fa198a8102aa6c7a97378.tar.gz
kernel-qcow2-util-linux-6e2d5a4460da45cb120fa198a8102aa6c7a97378.tar.xz
kernel-qcow2-util-linux-6e2d5a4460da45cb120fa198a8102aa6c7a97378.zip
include/c.h: add USAGE_COMMANDS and USAGE_COLUMNS
* login-utils/lslogins.c: all uses changed * misc-utils/findmnt.c: likewise * sys-utils/blkzone.c: likewise * disk-utils/sfdisk.c: likewise * sys-utils/lscpu.c: likewise * sys-utils/lsmem.c: likewise * sys-utils/wdctl.c: likewise Signed-off-by: J William Piggott <elseifthen@gmx.com>
Diffstat (limited to 'sys-utils')
-rw-r--r--sys-utils/blkzone.c2
-rw-r--r--sys-utils/lscpu.c3
-rw-r--r--sys-utils/lsmem.c5
-rw-r--r--sys-utils/wdctl.c3
4 files changed, 5 insertions, 8 deletions
diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c
index 7713ff3b2..8fd55c066 100644
--- a/sys-utils/blkzone.c
+++ b/sys-utils/blkzone.c
@@ -300,7 +300,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_SEPARATOR, out);
fputs(_("Run zone command on the given block device.\n"), out);
- fputs(_("\nCommands:\n"), out);
+ fputs(USAGE_COMMANDS, out);
for (i = 0; i < ARRAY_SIZE(commands); i++)
fprintf(out, " %-11s %s\n", commands[i].name, _(commands[i].help));
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 3b549a7a0..2871f7131 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -2068,8 +2068,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_HELP, out);
fputs(USAGE_VERSION, out);
- fprintf(out, _("\nAvailable columns:\n"));
-
+ fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(coldescs); i++)
fprintf(out, " %13s %s\n", coldescs[i].name, _(coldescs[i].help));
diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c
index 0c8adb829..891be36f7 100644
--- a/sys-utils/lsmem.c
+++ b/sys-utils/lsmem.c
@@ -388,10 +388,9 @@ static void __attribute__((__noreturn__)) lsmem_usage(FILE *out)
fputs(USAGE_HELP, out);
fputs(USAGE_VERSION, out);
- fputs(_("\nAvailable columns:\n"), out);
-
+ fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(coldescs); i++)
- fprintf(out, " %10s %s\n", coldescs[i].name, coldescs[i].help);
+ fprintf(out, " %10s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, USAGE_MAN_TAIL("lsmem(1)"));
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index e47fc70e9..1790e8993 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -194,9 +194,8 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(USAGE_SEPARATOR, out);
fprintf(out, _("The default device is %s.\n"), _PATH_WATCHDOG_DEV);
- fputs(USAGE_SEPARATOR, out);
- fputs(_("Available columns:\n"), out);
+ fputs(USAGE_COLUMNS, out);
for (i = 0; i < ARRAY_SIZE(infos); i++)
fprintf(out, " %13s %s\n", infos[i].name, _(infos[i].help));