From c3a4cfc5795da0a5f7eb2753aef3f543d12c8341 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 26 Jun 2017 14:09:53 +0200 Subject: misc: consolidate usage() "Available columns" Signed-off-by: Karel Zak --- disk-utils/fdisk-list.c | 2 +- disk-utils/partx.c | 3 +-- include/c.h | 2 +- misc-utils/fincore.c | 2 +- misc-utils/lsblk.c | 2 +- misc-utils/lslocks.c | 2 +- sys-utils/losetup.c | 2 +- sys-utils/lsns.c | 3 +-- sys-utils/prlimit.c | 3 +-- sys-utils/swapon.c | 2 +- sys-utils/zramctl.c | 2 +- 11 files changed, 11 insertions(+), 14 deletions(-) diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c index 0985bd51f..08732e95a 100644 --- 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 941fc46aa..93fbc9c1d 100644 --- 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 9c676ff04..3e5b87d3f 100644 --- 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 2a6b14789..84b83c6f2 100644 --- 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 1e8108290..dddd2a068 100644 --- 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 8bb793261..b33ffc179 100644 --- 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 8ed9a1e4b..9ff547edb 100644 --- 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 ecb0d8969..05d3ec620 100644 --- 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 afd19281b..302103f8b 100644 --- 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 6bd057dd2..a46633b16 100644 --- 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 7286d8877..7b001fe5d 100644 --- 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)); -- cgit v1.2.3-55-g7522