treewide: consolidate --list-columns option in usage() to USAGE_LIST_COLUMNS_OPTION()

This consolidates the --list-columns description in the usage()
of ls-like tools to the USAGE_LIST_COLUMNS_OPTION() macro. It
makes it simplier and ensures a consistent definition.

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/lsfd-cmd/lsfd.c b/lsfd-cmd/lsfd.c
index 4596697ad94d895937beec15b7c053dde1dda519..335594144dc395f2d9e4fe32b49131c88573de6d 100644 (file)
--- a/lsfd-cmd/lsfd.c
+++ b/lsfd-cmd/lsfd.c
@@ -2237,7 +2237,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --_drop-privilege        (testing purpose) do setuid(1) just after starting\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       fputs(_(" -H, --list-columns           list the available columns\n"), out);
+       fprintf(out, USAGE_LIST_COLUMNS_OPTION(30));
        fprintf(out, USAGE_HELP_OPTIONS(30));
 
        fputs(USAGE_DEFAULT_COLUMNS, out);

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 83989c10ec8dbdc8bb68fa32b178a6e3bc99a97e..78511dca7bfcce333784d42667c465009f64d6b0 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1593,7 +1593,7 @@ static void __attribute__((__noreturn__)) usage(void)
 
 
        fputs(USAGE_SEPARATOR, out);
-       fputs(_(" -H, --list-columns     list the available columns\n"), out);
+       fprintf(out, USAGE_LIST_COLUMNS_OPTION(24));
        fprintf(out, USAGE_HELP_OPTIONS(24));
 
        fprintf(out, USAGE_MAN_TAIL("findmnt(8)"));

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 39a8ca83f4df00fbcb355243b2b49f55d5966fe4..8f09093b4dedd2d96a38237618ff4fe1d6a6cad5 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -2353,7 +2353,7 @@ static void __attribute__((__noreturn__)) usage(void)
                "                      methods used to gather data (default: file,udev,blkid)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       fputs(_(" -H, --list-columns   list the available columns\n"), out);
+       fprintf(out, USAGE_LIST_COLUMNS_OPTION(22));
        fprintf(out, USAGE_HELP_OPTIONS(22));
 
        fprintf(out, USAGE_MAN_TAIL("lsblk(8)"));

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 175b4e717096bccd7354287ed9ac80fd93131f25..42a67fa9682753c18c9351b0c55b0bc82d18c590 100644 (file)
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -820,7 +820,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -u, --notruncate       don't truncate text in columns\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       fputs(_(" -H, --list-columns     list the available columns\n"), out);
+       fprintf(out, USAGE_LIST_COLUMNS_OPTION(24));
        fprintf(out, USAGE_HELP_OPTIONS(24));
        fprintf(out, USAGE_MAN_TAIL("lslocks(8)"));
 

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index f144b1d655fc6ee3630c238ef4a06d2656da63fa..0be6668b2271ff73fcfe9d7cdc62fcad7066a676 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1212,7 +1212,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --hierarchic[=when] use subsections in summary (auto, never, always)\n"), out);
        fputs(_("     --output-all        print all available columns for -e, -p or -C\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       fputs(_(" -H, --list-columns      list the available columns\n"), out);
+       fprintf(out, USAGE_LIST_COLUMNS_OPTION(25));
        fprintf(out, USAGE_HELP_OPTIONS(25));
 
        fprintf(out, USAGE_MAN_TAIL("lscpu(1)"));

diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
index 14556987c7456bcb9b1148a311671d72e3da119b..2e887e80253e450843615e77962d7bd177dcf2f1 100644 (file)
--- a/sys-utils/lsns.c
+++ b/sys-utils/lsns.c
@@ -1584,7 +1584,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -T, --tree[=<rel>]     use tree format (parent, owner, or process)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       fputs(_(" -H, --list-columns     list the available columns\n"), out);
+       fprintf(out, USAGE_LIST_COLUMNS_OPTION(24));
        fprintf(out, USAGE_HELP_OPTIONS(24));
        fprintf(out, USAGE_MAN_TAIL("lsns(8)"));