misc: consolidate usage() "Available columns"

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c
index 0985bd51fb44a09424479e74ec684378c640367b..08732e95a0ca2be976cbe51a7b8d7f228c03ee8c 100644 (file)
--- a/disk-utils/fdisk-list.c
+++ b/disk-utils/fdisk-list.c
@@ -429,7 +429,7 @@ void list_available_columns(FILE *out)
 
        termwidth = get_terminal_width(80);
 
-       fprintf(out, _("\nAvailable columns (for -o):\n"));
+       fprintf(out, USAGE_COLUMNS);
 
        while (fdisk_next_label(cxt, &lb) == 0) {
                size_t width = 6;       /* label name and separators */

diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 941fc46aaf333b0507ce3ec1f84eec9ed621cfb2..93fbc9c1df8f941dfe2989b67b8ebcb8bfa50d6a 100644 (file)
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -775,8 +775,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);
 
-       fputs(_("\nAvailable columns (for --show, --raw or --pairs):\n"), out);
-
+       fputs(USAGE_COLUMNS, out);
        for (i = 0; i < NCOLS; i++)
                fprintf(out, " %10s  %s\n", infos[i].name, _(infos[i].help));
 

diff --git a/include/c.h b/include/c.h
index 9c676ff04b8f9d78e658744f16380cd7eb280fd8..3e5b87d3fd78b0c8e49df9e32ff88fa7310b3023 100644 (file)
--- a/include/c.h
+++ b/include/c.h
@@ -313,7 +313,7 @@ static inline int xusleep(useconds_t usec)
 #define USAGE_OPTIONS    _("\nOptions:\n")
 #define USAGE_FUNCTIONS  _("\nFunctions:\n")
 #define USAGE_COMMANDS   _("\nCommands:\n")
-#define USAGE_COLUMNS    _("\nAvailable columns:\n")
+#define USAGE_COLUMNS    _("\nAvailable output 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/misc-utils/fincore.c b/misc-utils/fincore.c
index 2a6b1478917878c680624d890a967d50ec43f811..84b83c6f22c5506e67764a6c3b0d7be6cabbfebb 100644 (file)
--- a/misc-utils/fincore.c
+++ b/misc-utils/fincore.c
@@ -276,7 +276,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);
 
-       fprintf(out, _("\nAvailable columns (for --output):\n"));
+       fprintf(out, USAGE_COLUMNS);
 
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 1e8108290234b6b76b086f1c32b482b950d05f72..dddd2a068bba976fd893d134dd55642d12eae0d0 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1660,7 +1660,7 @@ static void __attribute__((__noreturn__)) help(FILE *out)
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);
 
-       fprintf(out, _("\nAvailable columns (for --output):\n"));
+       fprintf(out, USAGE_COLUMNS);
 
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 8bb793261b228224881112118e0cda27d9ddeb29..b33ffc1798ea628f2e2cd53dfb12abd07686ccf5 100644 (file)
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -509,7 +509,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);
 
-       fputs(_("\nAvailable columns (for --output):\n"), out);
+       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/losetup.c b/sys-utils/losetup.c
index 8ed9a1e4bf5eaa88007af6a7dceb20dfc20ec698..9ff547edb57246f0e48ce6c03a6b6cda2a207f99 100644 (file)
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -421,7 +421,7 @@ static void usage(FILE *out)
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);
 
-       fputs(_("\nAvailable --output columns:\n"), out);
+       fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %12s  %s\n", infos[i].name, _(infos[i].help));
 

diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
index ecb0d896947031f5b291a74af1ae19cdeb55780e..05d3ec620e35dc6e24d2dfacfae513a1674e066b 100644 (file)
--- a/sys-utils/lsns.c
+++ b/sys-utils/lsns.c
@@ -629,8 +629,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);
 
-       fputs(_("\nAvailable columns (for --output):\n"), out);
-
+       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/prlimit.c b/sys-utils/prlimit.c
index afd19281b73e9857747658ad96dae9833c4676cf..302103f8bdae5c4e8da11fef13778a6cd4fbb394 100644 (file)
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -193,8 +193,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                " -y, --rttime           CPU time in microseconds a process scheduled\n"
                "                        under real-time scheduling\n"), out);
 
-       fputs(_("\nAvailable columns (for --output):\n"), out);
-
+       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/swapon.c b/sys-utils/swapon.c
index 6bd057dd2f24e44764a0c942e5e6ded868a69c22..a46633b160aabcc6bacbe1f60b9436d11b83c11f 100644 (file)
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -824,7 +824,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
                " pages   : freed pages are discarded before they are reused\n"
                "If no policy is selected, both discard types are enabled (default).\n"), out);
 
-       fputs(_("\nAvailable columns (for --show):\n"), out);
+       fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %-5s  %s\n", infos[i].name, _(infos[i].help));
 

diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 7286d887741cb0d86049efb8cd875a74de7ba81b..7b001fe5d0c68f0db5068ebbf854a4d95f4892f6 100644 (file)
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -545,7 +545,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);
 
-       fputs(_("\nAvailable columns (for --output):\n"), out);
+       fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));