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>

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 2ac8cef0222c3aaefd80d77e09be8cc902c235c0..2a75190f543dfd42d4ba0d17ba5dca6d0cf37803 100644 (file)
--- 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 2bcdcea5daf860d0b18f79fde1d7115ca24ccedf..f89e065b24415dec6d7fad383240538297ea011c 100644 (file)
--- 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 ab04c10bb2214f738feed77219ce4ae6deec4e70..9cbf0b365cc51b45855bb02ca4e782e6c3f8d7ef 100644 (file)
--- 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 93c0e90efb881105e3020d59c056ad7fce585008..7acc60a26bb25e21d7563bf60b7a84e5ee7803c0 100644 (file)
--- 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 7713ff3b28cbea04769cc7a241df7753b6288847..8fd55c06670c9a780335e108f6db64f9c4f9cc1b 100644 (file)
--- 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 3b549a7a0c25832be0c54cd38bd87ef97993a816..2871f7131eae11df65b56d53285ca039b198121e 100644 (file)
--- 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 0c8adb82967f6f21dd76ac4c343fe23bdeec7f0f..891be36f76458dcce765f374e478a4fc82f732c4 100644 (file)
--- 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 e47fc70e989404260dbd68b112c52b8dcf582831..1790e8993b7a5f51bb43b25e3c8d78638b119c33 100644 (file)
--- 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));