diff options
| -rw-r--r-- | disk-utils/sfdisk.c | 2 | ||||
| -rw-r--r-- | include/c.h | 4 | ||||
| -rw-r--r-- | login-utils/lslogins.c | 6 | ||||
| -rw-r--r-- | misc-utils/findmnt.c | 3 | ||||
| -rw-r--r-- | sys-utils/blkzone.c | 2 | ||||
| -rw-r--r-- | sys-utils/lscpu.c | 3 | ||||
| -rw-r--r-- | sys-utils/lsmem.c | 5 | ||||
| -rw-r--r-- | sys-utils/wdctl.c | 3 |
8 files changed, 12 insertions, 16 deletions
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 2ac8cef02..2a75190f5 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -1850,7 +1850,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out) fputs(USAGE_SEPARATOR, out); fputs(_("Display or manipulate a disk partition table.\n"), out); - fputs(_("\nCommands:\n"), out); + fputs(USAGE_COMMANDS, out); fputs(_(" -A, --activate <dev> [<part> ...] list or set bootable MBR partitions\n"), out); fputs(_(" -d, --dump <dev> dump partition table (usable for later input)\n"), out); fputs(_(" -J, --json <dev> dump partition table in JSON format\n"), out); diff --git a/include/c.h b/include/c.h index 2bcdcea5d..f89e065b2 100644 --- a/include/c.h +++ b/include/c.h @@ -313,11 +313,13 @@ static inline int xusleep(useconds_t usec) /* * Constant strings for usage() functions. For more info see - * Documentation/howto-usage-function.txt and disk-utils/delpart.c + * Documentation/{howto-usage-function.txt,boilerplate.c} */ #define USAGE_HEADER _("\nUsage:\n") #define USAGE_OPTIONS _("\nOptions:\n") #define USAGE_FUNCTIONS _("\nFunctions:\n") +#define USAGE_COMMANDS _("\nCommands:\n") +#define USAGE_COLUMNS _("\nAvailable columns:\n") #define USAGE_SEPARATOR "\n" #define USAGE_HELP _(" -h, --help display help information and exit\n") #define USAGE_VERSION _(" -V, --version display version information and exit\n") diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c index ab04c10bb..9cbf0b365 100644 --- a/login-utils/lslogins.c +++ b/login-utils/lslogins.c @@ -1255,11 +1255,9 @@ 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, " %14s %s\n", coldescs[i].name, - _(coldescs[i].help)); + fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help)); fprintf(out, USAGE_MAN_TAIL("lslogins(1)")); diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index 93c0e90ef..7acc60a26 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -1248,8 +1248,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(infos); i++) fprintf(out, " %11s %s\n", infos[i].name, _(infos[i].help)); 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)); |