From: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
Date: Sat, 11 Oct 2025 00:15:51 +0000 (-0400)
Subject: treewide: consolidate --list-columns option in usage() to USAGE_LIST_COLUMNS_OPTION()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92b82b9a0f2de981ff84097b9fe4be912f16218c;p=thirdparty%2Futil-linux.git

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 4596697ad..335594144 100644
--- 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 83989c10e..78511dca7 100644
--- 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 39a8ca83f..8f09093b4 100644
--- 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 175b4e717..42a67fa96 100644
--- 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 f144b1d65..0be6668b2 100644
--- 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 14556987c..2e887e802 100644
--- 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)"));