misc: consolidate macro style USAGE_HELP_OPTIONS

changed in include/c.h and applied via sed:

  sed -i 's/fprintf.*\(USAGE_MAN_TAIL.*\)/printf(\1/' $(git ls-files -- "*.c")
  sed -i 's/print_usage_help_options\(.*\);/printf(USAGE_HELP_OPTIONS\1);/' $(git ls-files -- "*.c")

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/Documentation/boilerplate.c b/Documentation/boilerplate.c
index c97ad46bc8868abf15ebc78f027793d329887e29..ddac4e67aa5839d01c00e693577b1b01232c6645 100644 (file)
--- a/Documentation/boilerplate.c
+++ b/Documentation/boilerplate.c
@@ -56,8 +56,8 @@ static void __attribute__((__noreturn__)) usage(void)
                "                           consecutive lines are intended by two spaces\n"), out);
        fputs(_(" -f, --foobar            next option description resets indent\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25); /* char offset to align option descriptions */
-       fprintf(out, USAGE_MAN_TAIL("fixme-command-name(1)"));
+       printf(USAGE_HELP_OPTIONS(25)); /* char offset to align option descriptions */
+       printf(USAGE_MAN_TAIL("fixme-command-name(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/addpart.c b/disk-utils/addpart.c
index e793ae03f7b33b51ccf8ea99fd706e22e13a8a4d..018c99585f667bb204dde534f7280d1143830b5c 100644 (file)
--- a/disk-utils/addpart.c
+++ b/disk-utils/addpart.c
@@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Tell the kernel about the existence of a specified partition.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("addpart(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("addpart(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index 976d416286ba97de53cd4143b34a005ae21e9098..f1ea53347ff290eb8dd0c46cd20380523a92e32b 100644 (file)
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -197,7 +197,7 @@ static void __attribute__((__noreturn__)) usage(void)
        puts(  _(" -v             verbose mode"));
        puts(  _("     --report   print report for specified (or all) devices"));
        fputs(USAGE_SEPARATOR, stdout);
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
 
        fputs(USAGE_SEPARATOR, stdout);
        puts(  _("Available commands:"));

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 6bacc60f3388247e1d644d66e1bf5a625045788e..00c512e491af2a5c2cedb8677acca41886016825 100644 (file)
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -2559,9 +2559,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -z, --zero               start with zeroed partition table\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
 
-       fprintf(out, USAGE_MAN_TAIL("cfdisk(8)"));
+       printf(USAGE_MAN_TAIL("cfdisk(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/delpart.c b/disk-utils/delpart.c
index 83cd1ce46032fd9cac7702778325787e15f52807..dc069970d2bf2caf6f8b7ada9ec80454167f38d9 100644 (file)
--- a/disk-utils/delpart.c
+++ b/disk-utils/delpart.c
@@ -19,8 +19,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Tell the kernel to forget about a specified partition.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("delpart(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("delpart(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index f84b847338023be7bb27c7afcfbc298d4f90f4dc..f461c82e1c60ed1f182dd74bf09d1881bb03e50c 100644 (file)
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -156,8 +156,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -n, --no-verify   disable the verification after the format\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(19);
-       fprintf(out, USAGE_MAN_TAIL("fdformat(8)"));
+       printf(USAGE_HELP_OPTIONS(19));
+       printf(USAGE_MAN_TAIL("fdformat(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index 937304c7e3ab9527a80d5d15eb75d87fc6621583..56c8d63ac29c6819768ab0e10effd9f2558e9760 100644 (file)
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -785,11 +785,11 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -S, --sectors <number>        specify the number of sectors per track\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(31);
+       printf(USAGE_HELP_OPTIONS(31));
 
        list_available_columns(out);
 
-       fprintf(out, USAGE_MAN_TAIL("fdisk(8)"));
+       printf(USAGE_MAN_TAIL("fdisk(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 3fe3959c19df9b5adc08baa2ec1cfdda84bfb0b0..58fd8ac5994ef81f457d386b44b4c7e17a531850 100644 (file)
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -1398,7 +1398,7 @@ static void __attribute__((__noreturn__)) usage(void)
        printf( "     --version  %s\n", USAGE_OPTSTR_VERSION);
        fputs(USAGE_SEPARATOR, out);
        fputs(_("See the specific fsck.* commands for available fs-options."), out);
-       fprintf(out, USAGE_MAN_TAIL("fsck(8)"));
+       printf(USAGE_MAN_TAIL("fsck(8)"));
        exit(FSCK_EX_OK);
 }
 

diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 46568527822fe82cfbdb835a8b8f6eede1804a26..50c7d33b9e0d8a30da2e130124307e2eb75cbf97 100644 (file)
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -120,7 +120,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -b, --blocksize <size>   use this blocksize, defaults to page size\n"), out);
        fputs(_("     --extract[=<dir>]    test uncompression, optionally extract into <dir>\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
 
        printf(USAGE_MAN_TAIL("fsck.cramfs(8)"));
        exit(FSCK_EX_OK);

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index a96f77f6f2ce4c33482ec2dd7b4ab2bd38bfaf75..b978684a83cb8d99f1ed58d6786acd8ba6802e5b 100644 (file)
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -192,8 +192,8 @@ usage(void) {
        fputs(_(" -m, --uncleared  activate mode not cleared warnings\n"), out);
        fputs(_(" -f, --force      force check\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(18);
-       fprintf(out, USAGE_MAN_TAIL("fsck.minix(8)"));
+       printf(USAGE_HELP_OPTIONS(18));
+       printf(USAGE_MAN_TAIL("fsck.minix(8)"));
        exit(FSCK_EX_OK);
 }
 

diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c
index 2b2e1ee66f9fcec0c57fd695c0f5745a83f8b462..5fbbbfc76ed045548650993a03a5ab6c4b354010 100644 (file)
--- a/disk-utils/isosize.c
+++ b/disk-utils/isosize.c
@@ -141,8 +141,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -d, --divisor=<number>  divide the amount of bytes by <number>\n"), out);
        fputs(_(" -x, --sectors           show sector count and size\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
-       fprintf(out, USAGE_MAN_TAIL("isosize(8)"));
+       printf(USAGE_HELP_OPTIONS(25));
+       printf(USAGE_MAN_TAIL("isosize(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index fbf2887caf176fe399b57b4f09b4c75d7094f9b8..5bf8fdfd890beabdf5cacba64e25da38c68f50f9 100644 (file)
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -85,9 +85,9 @@ static void __attribute__((__noreturn__)) usage(void)
                       " -c                  this option is silently ignored\n"
                       " -l                  this option is silently ignored\n"
                       ));
-       print_usage_help_options(21);
+       printf(USAGE_HELP_OPTIONS(21));
 
-       fprintf(out, USAGE_MAN_TAIL("mkfs.bfs(8)"));
+       printf(USAGE_MAN_TAIL("mkfs.bfs(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index f7b0c0a0904b7b19db92fde3fcdbe6f750e24aa4..5bcd9613cdd7a83b2860c11c63c9115db9cf5727 100644 (file)
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -55,9 +55,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fprintf(out, _("     <size>         number of blocks to be used on the device\n"));
        fprintf(out, _(" -V, --verbose      explain what is being done;\n"
                       "                      specifying -V more than once will cause a dry-run\n"));
-       print_usage_help_options(20);
+       printf(USAGE_HELP_OPTIONS(20));
 
-       fprintf(out, USAGE_MAN_TAIL("mkfs(8)"));
+       printf(USAGE_MAN_TAIL("mkfs(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index ec83f48daf5fdfc49dc9422fc4745de7926270f6..a3e9aa48c72aac86e4f9c35d44deab5341d7700e 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -143,7 +143,7 @@ static void __attribute__((__noreturn__)) usage(void)
                program_invocation_short_name, PAD_SIZE);
 
        fputs(USAGE_SEPARATOR, stdout);
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
        printf(USAGE_MAN_TAIL("mkfs.cramfs(8)"));
        exit(MKFS_EX_OK);
 }

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index e77d0b89f0159671f66251083dd24b91fd061311..54c47da7e5a3aa8dfdf3b9028655b34eb1cd7def 100644 (file)
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -145,8 +145,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -c, --check             check the device for bad blocks\n"), out);
        fputs(_(" -l, --badblocks <file>  list of bad blocks from file\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
-       fprintf(out, USAGE_MAN_TAIL("mkfs.minix(8)"));
+       printf(USAGE_HELP_OPTIONS(25));
+       printf(USAGE_MAN_TAIL("mkfs.minix(8)"));
        exit(MKFS_EX_OK);
 }
 

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 593a61e03de174fb512730e19616c5f47274bd1c..748e241cf97dc9109c125093d663c9220b1ab894 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -161,7 +161,7 @@ static void __attribute__((__noreturn__)) usage(void)
                " -v, --swapversion NUM     specify swap-space version number\n"
                " -U, --uuid UUID           specify the uuid to use\n"
                ));
-       print_usage_help_options(27);
+       printf(USAGE_HELP_OPTIONS(27));
 
        printf(USAGE_MAN_TAIL("mkswap(8)"));
        exit(EXIT_SUCCESS);

diff --git a/disk-utils/partx.c b/disk-utils/partx.c
index 474c80e467b7a6d7b958796d130e3722bf97dff9..43a6448dbb4b81216e66f0eb463918868662c6a5 100644 (file)
--- a/disk-utils/partx.c
+++ b/disk-utils/partx.c
@@ -773,13 +773,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose        verbose mode\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(22);
+       printf(USAGE_HELP_OPTIONS(22));
 
        fputs(USAGE_COLUMNS, out);
        for (i = 0; i < NCOLS; i++)
                fprintf(out, " %10s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("partx(8)"));
+       printf(USAGE_MAN_TAIL("partx(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/disk-utils/raw.c b/disk-utils/raw.c
index 1de7f813ec80aa83485a1c5be8640334d0970f2d..8abcbb747f282fd8a4446eb2b949e20f2c674965 100644 (file)
--- a/disk-utils/raw.c
+++ b/disk-utils/raw.c
@@ -59,8 +59,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -q, --query    set query mode\n"), out);
        fputs(_(" -a, --all      query all raw devices\n"), out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("raw(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("raw(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/resizepart.c b/disk-utils/resizepart.c
index 38e7caceae3c813a0ecb2f4691aa9003083fe140..15aa01b8f474fe0af1f98a6cec3bcd216a784198 100644 (file)
--- a/disk-utils/resizepart.c
+++ b/disk-utils/resizepart.c
@@ -24,8 +24,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Tell the kernel about the new size of a partition.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("resizepart(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("resizepart(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 8616ee9508e69c07ed2ea9f2b4c1502241e7a083..c3a97a4794f491ca2faba1af92bf037f9a59f815 100644 (file)
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1906,7 +1906,7 @@ static void __attribute__((__noreturn__)) usage(void)
 
        list_available_columns(out);
 
-       fprintf(out, USAGE_MAN_TAIL("sfdisk(8)"));
+       printf(USAGE_MAN_TAIL("sfdisk(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index c4e6873c0f1e5ccd828bd6960db098d9afda47ce..7785bcebcca5769225978b39e9b226ab8957c010 100644 (file)
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -125,8 +125,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -L, --label <label> specify a new label\n"
                " -U, --uuid <uuid>   specify a new uuid\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(21);
-       fprintf(out, USAGE_MAN_TAIL("swaplabel(8)"));
+       printf(USAGE_HELP_OPTIONS(21));
+       printf(USAGE_MAN_TAIL("swaplabel(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/include/c.h b/include/c.h
index fc766e069adc4dbd53e64cf276ebbc19c22fceb1..119a127e30cbce3ca44233c729b34e10877e0279 100644 (file)
--- a/include/c.h
+++ b/include/c.h
@@ -319,13 +319,11 @@ static inline int xusleep(useconds_t usec)
 #define USAGE_OPTSTR_HELP     _("display this help")
 #define USAGE_OPTSTR_VERSION  _("print version")
 
-#define print_usage_help_options(marg_dsc) \
-       printf( \
+#define USAGE_HELP_OPTIONS(marg_dsc) \
                "%-" #marg_dsc "s%s\n" \
                "%-" #marg_dsc "s%s\n" \
                , " -h, --help",    USAGE_OPTSTR_HELP \
-               , " -V, --version", USAGE_OPTSTR_VERSION \
-       )
+               , " -V, --version", USAGE_OPTSTR_VERSION
 
 #define USAGE_MAN_TAIL(_man)   _("\nFor more details see %s.\n"), _man
 

diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 7d14e7b4cfe59992c409ded8055ba44be7ea87a5..c5312fa0c4750e8e2b5ecdc10724e1f3581e5c43 100644 (file)
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -106,7 +106,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(USAGE_SEPARATOR, fp);
        printf( " -u, --help                   %s\n", USAGE_OPTSTR_HELP);
        printf( " -v, --version                %s\n", USAGE_OPTSTR_VERSION);
-       fprintf(fp, USAGE_MAN_TAIL("chfn(1)"));
+       printf(USAGE_MAN_TAIL("chfn(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 9b19b84f06dbd3ceb95476b81e8808b4ebc479b7..4721c870e2b32fac217385241de58bc73b0b5f0d 100644 (file)
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -85,7 +85,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(USAGE_SEPARATOR, fp);
        printf( " -u, --help           %s\n", USAGE_OPTSTR_HELP);
        printf( " -v, --version        %s\n", USAGE_OPTSTR_VERSION);
-       fprintf(fp, USAGE_MAN_TAIL("chsh(1)"));
+       printf(USAGE_MAN_TAIL("chsh(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/login-utils/last.c b/login-utils/last.c
index 1218a3018d15c7eeedc6e681ae66d4c0370c5dbd..ae0d4c9c7f97185dd08451e6885c34d2c150577a 100644 (file)
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -589,8 +589,8 @@ static void __attribute__((__noreturn__)) usage(const struct last_control *ctl)
                "                               notime|short|full|iso\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(22);
-       fprintf(out, USAGE_MAN_TAIL("last(1)"));
+       printf(USAGE_HELP_OPTIONS(22));
+       printf(USAGE_MAN_TAIL("last(1)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index 8b9933eb72923f297803d91c75115eb5150ea9a7..186ec6cbdfefe5ecc8c66d502717d0567d1f45d4 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1253,13 +1253,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --wtmp-file <path>   set an alternate path for wtmp\n"), out);
        fputs(_("     --btmp-file <path>   set an alternate path for btmp\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
 
        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, USAGE_MAN_TAIL("lslogins(1)"));
+       printf(USAGE_MAN_TAIL("lslogins(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c
index ce3fefbc16d87b8cce2f6f0146aad9d0f6336f1f..7358ba1121011b9a529fee65a305e4178371b78d 100644 (file)
--- a/login-utils/newgrp.c
+++ b/login-utils/newgrp.c
@@ -176,8 +176,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Log in to a new group.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("newgrp(1)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("newgrp(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/login-utils/nologin.c b/login-utils/nologin.c
index 44604dc77b2b462e893207595ed92f6d8b9d7a2a..b0b6a721c16f9e5e337e0d6e4e46448ab5745f0b 100644 (file)
--- a/login-utils/nologin.c
+++ b/login-utils/nologin.c
@@ -30,9 +30,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Politely refuse a login.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
 
-       fprintf(out, USAGE_MAN_TAIL("nologin(8)"));
+       printf(USAGE_MAN_TAIL("nologin(8)"));
        exit(EXIT_FAILURE);
 }
 

diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index 574d98e228782044fb9f312ec579a20470751c54..314f60abe67cdecc393a5f417d5fbe2cb81361b5 100644 (file)
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -709,7 +709,7 @@ usage(void)
   fputs (_(" -s, --shell <shell>             run <shell> if /etc/shells allows it\n"), stdout);
 
   fputs(USAGE_SEPARATOR, stdout);
-  print_usage_help_options(33);
+  printf(USAGE_HELP_OPTIONS(33));
   printf(USAGE_MAN_TAIL(su_mode == SU_MODE ? "su(1)" : "runuser(1)"));
   exit(EXIT_SUCCESS);
 }

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index 45f6cfa4c58d05a6eaca9d0a16544f5c086b6e2c..49b949a904c25e00722d6645f70682c3b67f4ac0 100644 (file)
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -812,8 +812,8 @@ static void usage(void)
                out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
-       fprintf(out, USAGE_MAN_TAIL("sulogin(8)"));
+       printf(USAGE_HELP_OPTIONS(26));
+       printf(USAGE_MAN_TAIL("sulogin(8)"));
 }
 
 int main(int argc, char **argv)

diff --git a/login-utils/utmpdump.c b/login-utils/utmpdump.c
index 41d6c3b1a83b3617d9c2106dd4e245522bc19613..00c44b8dbf754865bed5d999b0ee8be70c6c96b0 100644 (file)
--- a/login-utils/utmpdump.c
+++ b/login-utils/utmpdump.c
@@ -311,9 +311,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -f, --follow         output appended data as the file grows\n"), out);
        fputs(_(" -r, --reverse        write back dumped data into utmp file\n"), out);
        fputs(_(" -o, --output <file>  write to file instead of standard output\n"), out);
-       print_usage_help_options(22);
+       printf(USAGE_HELP_OPTIONS(22));
 
-       fprintf(out, USAGE_MAN_TAIL("utmpdump(1)"));
+       printf(USAGE_MAN_TAIL("utmpdump(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index e5614af651ab9f801eecf9fb74ea81fbf0581490..5999d8d15081d1d59333adfe2795935dc906ccd2 100644 (file)
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -306,8 +306,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Edit the password or group file.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("vipw(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("vipw(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 3aa2ee5a6fbda86779b4cd0fcb21ebfe0551d6ba..4cd85317fef80c32d09b486b362f9fdf253a301c 100644 (file)
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -103,8 +103,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(        " -n, --match-types <list>   filter by filesystem type (e.g. -n vfat,ext3)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(28);
-       fprintf(out, USAGE_MAN_TAIL("blkid(8)"));
+       printf(USAGE_HELP_OPTIONS(28));
+       printf(USAGE_MAN_TAIL("blkid(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 870fa689b68441d66c47d1ed08dabf6015c784dc..98bdff681849be678fb7afb364585577dbe3d018 100644 (file)
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -1015,8 +1015,8 @@ static void __attribute__((__noreturn__)) usage(void)
                "                         %s\n", USAGE_COLORS_DEFAULT);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(23);
-       fprintf(out, USAGE_MAN_TAIL("cal(1)"));
+       printf(USAGE_HELP_OPTIONS(23));
+       printf(USAGE_MAN_TAIL("cal(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/fincore.c b/misc-utils/fincore.c
index 9ef912758e6fa86995b7807948c77eee9f0ce3e7..f1596a7366da6390b7a6c6814bab8c76fcdf4db7 100644 (file)
--- a/misc-utils/fincore.c
+++ b/misc-utils/fincore.c
@@ -274,14 +274,14 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -r, --raw             use raw output format\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(23);
+       printf(USAGE_HELP_OPTIONS(23));
 
        fprintf(out, USAGE_COLUMNS);
 
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("fincore(1)"));
+       printf(USAGE_MAN_TAIL("fincore(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c
index fc16e44e6831a7a8332d180dff5c74da00637e91..99ad354fafdd5f351d9502436a64ffc54c70dc05 100644 (file)
--- a/misc-utils/findfs.c
+++ b/misc-utils/findfs.c
@@ -33,8 +33,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Find a filesystem by label or UUID.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("findfs(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("findfs(8)"));
        exit(FINDFS_SUCCESS);
 }
 

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 5219425000fb66a8b3f8ae9bb77e64033eb37c22..184b6f7d7b8bcdd7a8ea49f5810d0197805706dc 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1245,13 +1245,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --verbose          print more details\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
        fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("findmnt(8)"));
+       printf(USAGE_MAN_TAIL("findmnt(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 8150e3c034ee788337f0f85052aded5ca1c15bca..9b4f352795f5f006ba0645d4f09698f489015055 100644 (file)
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -346,7 +346,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -T, --test                    test for getopt(1) version\n"), stdout);
        fputs(_(" -u, --unquoted                do not quote the output\n"), stdout);
        fputs(USAGE_SEPARATOR, stdout);
-       print_usage_help_options(31);
+       printf(USAGE_HELP_OPTIONS(31));
        printf(USAGE_MAN_TAIL("getopt(1)"));
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 0778c6fad994024cbfe7409052bdfe2ee91af9cb..128c092f2c12bb1ad6c32c4fd1c697294168f189 100644 (file)
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -318,8 +318,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --verbose          print pids that will be signaled\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
-       fprintf(out, USAGE_MAN_TAIL("kill(1)"));
+       printf(USAGE_HELP_OPTIONS(24));
+       printf(USAGE_MAN_TAIL("kill(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 1ef60bb765923752e6911388013c51ae2ace717e..f6fb350cc843268a9a5e5c6ee931f3ad731cc8e7 100644 (file)
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -1027,8 +1027,8 @@ static void __attribute__((__noreturn__)) usage(void)
 #endif
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
-       fprintf(out, USAGE_MAN_TAIL("logger(1)"));
+       printf(USAGE_HELP_OPTIONS(26));
+       printf(USAGE_MAN_TAIL("logger(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/look.c b/misc-utils/look.c
index dfb77319ba640c7caa5326304546824bef5d6b51..60fbbbfca1a7fd1445a7fc63fb086a6e29bff885 100644 (file)
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -365,8 +365,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -t, --terminate <char>   define the string-termination character\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
-       fprintf(out, USAGE_MAN_TAIL("look(1)"));
+       printf(USAGE_HELP_OPTIONS(26));
+       printf(USAGE_MAN_TAIL("look(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 983804b9c7a1549f5a83ab9aabf2b2c8cc279c30..9d3460b43c7c6d4de6ff09eb48f8bd80efa9871e 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1658,14 +1658,14 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -t, --topology       output info about topology\n"), out);
        fputs(_(" -x, --sort <column>  sort output by <column>\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(22);
+       printf(USAGE_HELP_OPTIONS(22));
 
        fprintf(out, USAGE_COLUMNS);
 
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("lsblk(8)"));
+       printf(USAGE_MAN_TAIL("lsblk(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index d872e2dc752f07a6b7fd76a7e8f8762fa4183d49..24c6d6324a945727afa846bd2053d0ba6f431587 100644 (file)
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -507,14 +507,14 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -u, --notruncate       don't truncate text in columns\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
        fputs(USAGE_COLUMNS, out);
 
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("lslocks(8)"));
+       printf(USAGE_MAN_TAIL("lslocks(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index ce9c4bf44cafd85b2c85d19cafd3ce4d9ea43776..e6c799d2473641f22f9cd4e924732cc1df712d28 100644 (file)
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -91,8 +91,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose         explain what is being done\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(23);
-       fprintf(out, USAGE_MAN_TAIL("mcookie(1)"));
+       printf(USAGE_HELP_OPTIONS(23));
+       printf(USAGE_MAN_TAIL("mcookie(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 92ee22e1fbd0ed07372664866993da83a9d95baf..e2dbd0bf206e7d4ff4d673bf2cb915142ffb6e54 100644 (file)
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -343,9 +343,9 @@ static void __attribute__((__noreturn__)) usage(void)
                " -l, --long          use a long listing format (-m -o -v) \n"
                " -n, --nosymlinks    don't follow symlinks\n"
                " -v, --vertical      vertical align of modes and owners\n"), out);
-       print_usage_help_options(21);
+       printf(USAGE_HELP_OPTIONS(21));
 
-       fprintf(out, USAGE_MAN_TAIL("namei(1)"));
+       printf(USAGE_MAN_TAIL("namei(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index f5029836ab4bace26e68095281afe2831cb71c86..7c3cdf67da6674664f59acabe2b3fd7d055457b7 100644 (file)
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -144,8 +144,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -n, --no-act        do not make any changes\n"), out);
        fputs(_(" -o, --no-overwrite  don't overwrite existing files\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(21);
-       fprintf(out, USAGE_MAN_TAIL("rename(1)"));
+       printf(USAGE_HELP_OPTIONS(21));
+       printf(USAGE_MAN_TAIL("rename(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 492ad83d93802730600d21eb8d6b5687ca1a296a..2cfb383f0899726e67190ea8e2f6b1f37339f0e3 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -79,8 +79,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -d, --debug             run in debugging mode\n"), out);
        fputs(_(" -q, --quiet             turn on quiet mode\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
-       fprintf(out, USAGE_MAN_TAIL("uuidd(8)"));
+       printf(USAGE_HELP_OPTIONS(25));
+       printf(USAGE_MAN_TAIL("uuidd(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 8252fd528475b048a5c9e958cccbd0c3ef71a5a5..e33e43bf0f0ef96c74374e90f264b229a37b93a8 100644 (file)
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -32,8 +32,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -r, --random     generate random-based uuid\n"), out);
        fputs(_(" -t, --time       generate time-based uuid\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(18);
-       fprintf(out, USAGE_MAN_TAIL("uuidgen(1)"));
+       printf(USAGE_HELP_OPTIONS(18));
+       printf(USAGE_MAN_TAIL("uuidgen(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/uuidparse.c b/misc-utils/uuidparse.c
index 7618f43d2abd516196e0c70dee89ef83b64e9d47..49225ae2c8051028adcb366144b9c006c90d2bb2 100644 (file)
--- a/misc-utils/uuidparse.c
+++ b/misc-utils/uuidparse.c
@@ -103,13 +103,13 @@ static void __attribute__((__noreturn__)) usage(void)
        puts(_(" -n, --noheadings       don't print headings"));
        puts(_(" -o, --output <list>    COLUMNS to display (see below)"));
        puts(_(" -r, --raw              use the raw output format"));
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
        fputs(USAGE_COLUMNS, stdout);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(stdout, " %8s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(stdout, USAGE_MAN_TAIL("uuidparse(1)"));
+       printf(USAGE_MAN_TAIL("uuidparse(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index b4291c4e8f510d3ca4e2eb04690b45866eb6f5eb..bac158d46451bdbac0c1416c82db9151a0435f4b 100644 (file)
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -205,8 +205,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -l         output effective lookup paths\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("whereis(1)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("whereis(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index fefbcb5e962f80ee2c90d9cffd096dc0f0922321..e01fa0c253947186511bb6731e4d24007a5581c2 100644 (file)
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -625,13 +625,13 @@ usage(void)
        puts(_(" -q, --quiet         suppress output messages"));
        puts(_(" -t, --types <list>  limit the set of filesystem, RAIDs or partition tables"));
 
-       print_usage_help_options(21);
+       printf(USAGE_HELP_OPTIONS(21));
 
        fputs(USAGE_COLUMNS, stdout);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(stdout, " %8s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(stdout, USAGE_MAN_TAIL("wipefs(8)"));
+       printf(USAGE_MAN_TAIL("wipefs(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index fbe20e160181f4eb7c959069a1a994b698ba8cdd..a7698773761876b93c7d5cd7aea3f48ab3ccf7f3 100644 (file)
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -165,9 +165,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose        display status information\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(22);
+       printf(USAGE_HELP_OPTIONS(22));
 
-       fprintf(out, USAGE_MAN_TAIL("chrt(1)"));
+       printf(USAGE_MAN_TAIL("chrt(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/schedutils/ionice.c b/schedutils/ionice.c
index 098fb255e94cb3f08631aaaa3ccae1089b7a3bf9..671c245b8afd2e9766dd63e4d3ce0fbe01126fd1 100644 (file)
--- a/schedutils/ionice.c
+++ b/schedutils/ionice.c
@@ -121,9 +121,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -u, --uid <uid>...     act on already running processes owned by these users\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
-       fprintf(out, USAGE_MAN_TAIL("ionice(1)"));
+       printf(USAGE_MAN_TAIL("ionice(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/schedutils/taskset.c b/schedutils/taskset.c
index ca1734f7acd3de66f0db5c4084fc9d80aa28cb44..4d7fa1e9108973dd5621d5d9f93c003595e4f8cf 100644 (file)
--- a/schedutils/taskset.c
+++ b/schedutils/taskset.c
@@ -62,7 +62,7 @@ static void __attribute__((__noreturn__)) usage(void)
                " -p, --pid               operate on existing given pid\n"
                " -c, --cpu-list          display and specify cpus in list format\n"
                ));
-       print_usage_help_options(25);
+       printf(USAGE_HELP_OPTIONS(25));
 
        fputs(USAGE_SEPARATOR, out);
        fprintf(out, _(
@@ -78,7 +78,7 @@ static void __attribute__((__noreturn__)) usage(void)
                "    e.g. 0-31:2 is equivalent to mask 0x55555555\n"),
                program_invocation_short_name);
 
-       fprintf(out, USAGE_MAN_TAIL("taskset(1)"));
+       printf(USAGE_MAN_TAIL("taskset(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index d078f297be29b0d10a1698d3058be3aebbdef781..c19b67bf4d9d13bdd7b94d4fd532a3abcdd4b46d 100644 (file)
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -96,9 +96,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose       print aligned length and offset\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(21);
+       printf(USAGE_HELP_OPTIONS(21));
 
-       fprintf(out, USAGE_MAN_TAIL("blkdiscard(8)"));
+       printf(USAGE_MAN_TAIL("blkdiscard(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c
index 28038f071ec66e4a6791989b771ec8b65a4dd538..6d837ff289ed4c9ad453efcdc769502d0eb2a796 100644 (file)
--- a/sys-utils/blkzone.c
+++ b/sys-utils/blkzone.c
@@ -311,9 +311,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -c, --count <number>   maximum number of zones\n"), out);
        fputs(_(" -v, --verbose          display more details\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
-       fprintf(out, USAGE_MAN_TAIL("blkzone(8)"));
+       printf(USAGE_MAN_TAIL("blkzone(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/chcpu.c b/sys-utils/chcpu.c
index 620aabfba89934e7b83a0e66f143f2d6a666a875..12e52d8873fe1af4a18ba06f7a3734922dca23d6 100644 (file)
--- a/sys-utils/chcpu.c
+++ b/sys-utils/chcpu.c
@@ -251,7 +251,7 @@ static void __attribute__((__noreturn__)) usage(void)
                " -p, --dispatch <mode>         set dispatching mode\n"
                " -r, --rescan                  trigger rescan of cpus\n"
                ), stdout);
-       print_usage_help_options(31);
+       printf(USAGE_HELP_OPTIONS(31));
 
        printf(USAGE_MAN_TAIL("chcpu(8)"));
        exit(EXIT_SUCCESS);

diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c
index b0060ae25fdfb7d2864c3529466a74b6384fbfe0..d9bc95cc191a3351a52a3381cec344d79a88eedb 100644 (file)
--- a/sys-utils/chmem.c
+++ b/sys-utils/chmem.c
@@ -249,9 +249,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -b, --blocks   use memory blocks\n"), out);
        fputs(_(" -v, --verbose  verbose output\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
 
-       fprintf(out, USAGE_MAN_TAIL("chmem(8)"));
+       printf(USAGE_MAN_TAIL("chmem(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index 6b3f38f561bf75912777d3b357d01ea047f6e756..22814587f118c89e280a1d59f745eefc3f0fe5e3 100644 (file)
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -31,8 +31,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fprintf(out, _("Set the function of the Ctrl-Alt-Del combination.\n"));
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("ctrlaltdel(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("ctrlaltdel(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index ef12567c35c6bf4f7b0599c5e14a3552ff5f3c03..36d238f0192c7deefaef7c9d1a8827a709a96a2f 100644 (file)
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -306,7 +306,7 @@ static void __attribute__((__noreturn__)) usage(void)
                "                               [delta|reltime|ctime|notime|iso]\n"
                "Suspending/resume will make ctime and iso timestamps inaccurate.\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(29);
+       printf(USAGE_HELP_OPTIONS(29));
        fputs(_("\nSupported log facilities:\n"), out);
        for (i = 0; i < ARRAY_SIZE(level_names); i++)
                fprintf(out, " %7s - %s\n",
@@ -319,7 +319,7 @@ static void __attribute__((__noreturn__)) usage(void)
                        level_names[i].name,
                        _(level_names[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("dmesg(1)"));
+       printf(USAGE_MAN_TAIL("dmesg(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index f1d4474ebd1b44a25de0ecba2e414a15f7cdd8d6..aa90ff72f8184ad1ccb2cbca9ad85e0c0938d3cd 100644 (file)
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -159,10 +159,10 @@ static void __attribute__((__noreturn__)) usage(void)
                out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(29);
+       printf(USAGE_HELP_OPTIONS(29));
 
        fputs(_("\nBy default tries -r, -s, -f, and -q in order until success.\n"), out);
-       fprintf(out, USAGE_MAN_TAIL("eject(1)"));
+       printf(USAGE_MAN_TAIL("eject(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index d5dd9f7e17da1d8e3f2a916700e200a5259c2964..c8b2b2fcc5cb43542605a8f6e9f427bbaa4812b4 100644 (file)
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -101,9 +101,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose        verbose mode\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(22);
+       printf(USAGE_HELP_OPTIONS(22));
 
-       fprintf(out, USAGE_MAN_TAIL("fallocate(1)"));
+       printf(USAGE_MAN_TAIL("fallocate(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 170f96771cd22b824d332c6117842f52970fddb6..ed25230b92913d8a7acaa3d12cfb46a369100796 100644 (file)
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -70,7 +70,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(  " -F, --no-fork            execute command without forking\n"), stdout);
        fputs(_(  "     --verbose            increase verbosity\n"), stdout);
        fputs(USAGE_SEPARATOR, stdout);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
        printf(USAGE_MAN_TAIL("flock(1)"));
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/fsfreeze.c b/sys-utils/fsfreeze.c
index 487759220c9231999b1a74dcf66c97282a92e1f6..401ab5c980c3f9078fdb56b8fff78db7381d7665 100644 (file)
--- a/sys-utils/fsfreeze.c
+++ b/sys-utils/fsfreeze.c
@@ -47,8 +47,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -f, --freeze      freeze the filesystem\n"), out);
        fputs(_(" -u, --unfreeze    unfreeze the filesystem\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(19);
-       fprintf(out, USAGE_MAN_TAIL("fsfreeze(8)"));
+       printf(USAGE_HELP_OPTIONS(19));
+       printf(USAGE_MAN_TAIL("fsfreeze(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 56a14506627e6519e756f41182dfeb78fa59600f..387f260fd260ff3924423b3faa57bdc668d12447 100644 (file)
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -262,8 +262,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose       print number of discarded bytes\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(21);
-       fprintf(out, USAGE_MAN_TAIL("fstrim(8)"));
+       printf(USAGE_HELP_OPTIONS(21));
+       printf(USAGE_MAN_TAIL("fstrim(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index a0a48dd130c1753aa310b92d9368e4454588fdb8..a9d3887cab9a013b100a6b280758114534b3719c 100644 (file)
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1242,8 +1242,8 @@ usage(const struct hwclock_control *ctl)
        fputs(_("     --test           dry run; use -D to view what would have happened\n"), out);
        fputs(_(" -D, --debug          use debug mode\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(22);
-       fprintf(out, USAGE_MAN_TAIL("hwclock(8)"));
+       printf(USAGE_HELP_OPTIONS(22));
+       printf(USAGE_MAN_TAIL("hwclock(8)"));
        hwclock_exit(ctl, EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/ipcmk.c b/sys-utils/ipcmk.c
index c7b4a83eec29066152e94cfbaddb514823f55eb5..df836525a1a743b417a57df4b6beb110168e9990 100644 (file)
--- a/sys-utils/ipcmk.c
+++ b/sys-utils/ipcmk.c
@@ -76,8 +76,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -p, --mode <mode>        permission for the resource (default is 0644)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
-       fprintf(out, USAGE_MAN_TAIL("ipcmk(1)"));
+       printf(USAGE_HELP_OPTIONS(26));
+       printf(USAGE_MAN_TAIL("ipcmk(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/ipcrm.c b/sys-utils/ipcrm.c
index c1c8de25ae64ec3148212425a1ec97089214740e..a9f2d1b9ada28723a7d0f61d3034eddd862ba923 100644 (file)
--- a/sys-utils/ipcrm.c
+++ b/sys-utils/ipcrm.c
@@ -65,8 +65,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose              explain what is being done\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(28);
-       fprintf(out, USAGE_MAN_TAIL("ipcrm(1)"));
+       printf(USAGE_HELP_OPTIONS(28));
+       printf(USAGE_MAN_TAIL("ipcrm(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index e63f10afe9ef45382d1504073aa1ad654ac519eb..73cf28ab1c123c76aec7f09a0b94eb508f02098d 100644 (file)
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -58,7 +58,7 @@ static void __attribute__((__noreturn__)) usage(void)
 
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -i, --id <id>  print details on resource identified by <id>\n"), out);
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
 
        fputs(USAGE_SEPARATOR, out);
        fputs(_("Resource options:\n"), out);
@@ -76,7 +76,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -u, --summary     show status summary\n"), out);
        fputs(_("     --human       show sizes in human-readable format\n"), out);
        fputs(_(" -b, --bytes       show sizes in bytes\n"), out);
-       fprintf(out, USAGE_MAN_TAIL("ipcs(1)"));
+       printf(USAGE_MAN_TAIL("ipcs(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index 3c6b4aad6160a497ad2bdd0f76cd354a8d7c9967..eb04b5e337395f890c587015dce548ce64a9e70d 100644 (file)
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -213,7 +213,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -i, --iflag [-]<iflag>  set input mode flag\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
+       printf(USAGE_HELP_OPTIONS(25));
 
        fputs(_("\nKnown <ldisc> names:\n"), out);
        print_table(out, ld_discs);
@@ -222,7 +222,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("\nKnown <iflag> names:\n"), out);
        print_table(out, ld_iflags);
 
-       fprintf(out, USAGE_MAN_TAIL("ldattach(8)"));
+       printf(USAGE_MAN_TAIL("ldattach(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index d4740bd941f667c459fad0388a365aad9812633f..bbff98389f710405c3ea1673e0c21f1e27b27f5f 100644 (file)
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -419,13 +419,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --raw                     use raw --list output format\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(31);
+       printf(USAGE_HELP_OPTIONS(31));
 
        fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %12s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("losetup(8)"));
+       printf(USAGE_MAN_TAIL("losetup(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 852711e74b36020642c6e25e72c757c4c667aead..8b4fe0bcd910988febce90ed505c13016800aaaf 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -2065,13 +2065,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -x, --hex               print hexadecimal masks rather than lists of CPUs\n"), out);
        fputs(_(" -y, --physical          print physical instead of logical IDs\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
+       printf(USAGE_HELP_OPTIONS(25));
 
        fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(coldescs); i++)
                fprintf(out, " %13s  %s\n", coldescs[i].name, _(coldescs[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("lscpu(1)"));
+       printf(USAGE_MAN_TAIL("lscpu(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c
index 4bbd8d77bc7aa13f4284505956a2653fb703ca24..e99c861ab50a4336ff6faf4eb625cb54c06e4229 100644 (file)
--- a/sys-utils/lsipc.c
+++ b/sys-utils/lsipc.c
@@ -304,7 +304,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -t, --time               show attach, detach and change times\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
 
        fprintf(out, _("\nGeneric columns:\n"));
        for (i = COLDESC_IDX_GEN_FIRST; i <= COLDESC_IDX_GEN_LAST; i++)
@@ -326,7 +326,7 @@ static void __attribute__((__noreturn__)) usage(void)
        for (i = COLDESC_IDX_SUM_FIRST; i <= COLDESC_IDX_SUM_LAST; i++)
                fprintf(out, " %14s  %s\n", coldescs[i].name, _(coldescs[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("lsipc(1)"));
+       printf(USAGE_MAN_TAIL("lsipc(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c
index 4db6789666ec197e4cf2f0bf2b893105bc6f538b..aeffd29dd9f876f8057e3f2eeea06ae7c4b65f12 100644 (file)
--- a/sys-utils/lsmem.c
+++ b/sys-utils/lsmem.c
@@ -387,13 +387,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --summary[=when] print summary information (never,always or only)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(22);
+       printf(USAGE_HELP_OPTIONS(22));
 
        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, USAGE_MAN_TAIL("lsmem(1)"));
+       printf(USAGE_MAN_TAIL("lsmem(1)"));
 
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }

diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
index 6ed772c9fd0bc49e55170cbde9ac9c1eb5697151..1fb0b87f3d353ae11b7dd1bf2d4b90c74eaae82a 100644 (file)
--- a/sys-utils/lsns.c
+++ b/sys-utils/lsns.c
@@ -627,13 +627,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -t, --type <name>      namespace type (mnt, net, ipc, user, pid, uts, cgroup)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
        fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("lsns(8)"));
+       printf(USAGE_MAN_TAIL("lsns(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index e9a581150d7bc89fcf8dd7f95fb7222ecb78fbd2..83cccf63ec327738ec4643f1ef188c06191ab906 100644 (file)
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -426,7 +426,7 @@ static void __attribute__((__noreturn__)) usage(void)
        " -w, --rw, --read-write  mount the filesystem read-write (default)\n"));
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
+       printf(USAGE_HELP_OPTIONS(25));
 
        fprintf(out, _(
        "\nSource:\n"
@@ -458,7 +458,7 @@ static void __attribute__((__noreturn__)) usage(void)
        " --make-rprivate         recursively mark a whole subtree as private\n"
        " --make-runbindable      recursively mark a whole subtree as unbindable\n"));
 
-       fprintf(out, USAGE_MAN_TAIL("mount(8)"));
+       printf(USAGE_MAN_TAIL("mount(8)"));
 
        exit(MNT_EX_SUCCESS);
 }

diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index 30501385163494244a7c7a337327c29c422e7307..808cfb9d0dcb850b09c97692a39bb4edaafccbe5 100644 (file)
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -127,8 +127,8 @@ static void __attribute__((__noreturn__)) usage(void)
                " -d, --fs-devno     print maj:min device number of the filesystem\n"
                " -x, --devno        print maj:min device number of the block device\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(20);
-       fprintf(out, USAGE_MAN_TAIL("mountpoint(1)"));
+       printf(USAGE_HELP_OPTIONS(20));
+       printf(USAGE_MAN_TAIL("mountpoint(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 48932df8830c2d34f0da75aaff520b381b45793d..9c452c1d145e3cfbaf2ac559f34960c0813a1408 100644 (file)
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -97,8 +97,8 @@ static void __attribute__((__noreturn__)) usage(void)
 #endif
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
-       fprintf(out, USAGE_MAN_TAIL("nsenter(1)"));
+       printf(USAGE_HELP_OPTIONS(24));
+       printf(USAGE_MAN_TAIL("nsenter(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/pivot_root.c b/sys-utils/pivot_root.c
index bb9aec66bed47d4fd7cece097cb85553a632cce0..ea76d94bfe02fbabf27bc75f7eaaef1a3982b0da 100644 (file)
--- a/sys-utils/pivot_root.c
+++ b/sys-utils/pivot_root.c
@@ -38,8 +38,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Change the root filesystem.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("pivot_root(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("pivot_root(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c
index 37e0f9fed04bbc9b125eca00f63a31a4a64ca155..e8d95822ed9c63c5324465fd2c51a5e835882528 100644 (file)
--- a/sys-utils/prlimit.c
+++ b/sys-utils/prlimit.c
@@ -173,7 +173,7 @@ static void __attribute__((__noreturn__)) usage(void)
                "     --raw              use the raw output format\n"
                "     --verbose          verbose output\n"
                ), out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
        fputs(_("\nResources Options:\n"), out);
        fputs(_(" -c, --core             maximum size of core files created\n"
@@ -198,7 +198,7 @@ static void __attribute__((__noreturn__)) usage(void)
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("prlimit(1)"));
+       printf(USAGE_MAN_TAIL("prlimit(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/readprofile.c b/sys-utils/readprofile.c
index 7a85ba5ef2e3ee75c4a6bae2f986982b94bdbf66..035073847a36f040668f17571254605b1566dbbe 100644 (file)
--- a/sys-utils/readprofile.c
+++ b/sys-utils/readprofile.c
@@ -122,8 +122,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -r, --reset               reset all the counters (root only)\n"), out);
        fputs(_(" -n, --no-auto             disable byte order auto-detection\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(27);
-       fprintf(out, USAGE_MAN_TAIL("readprofile(8)"));
+       printf(USAGE_HELP_OPTIONS(27));
+       printf(USAGE_MAN_TAIL("readprofile(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/renice.c b/sys-utils/renice.c
index ca438bbbce05b5e6e13f8066095b1b2e4c8d593f..33852b4a8f41b614fb5579f0c01278a248cae6ec 100644 (file)
--- a/sys-utils/renice.c
+++ b/sys-utils/renice.c
@@ -73,8 +73,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -g, --pgrp <id>        interpret argument as process group ID\n"), out);
        fputs(_(" -u, --user <name>|<id> interpret argument as username or user ID\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
-       fprintf(out, USAGE_MAN_TAIL("renice(1)"));
+       printf(USAGE_HELP_OPTIONS(24));
+       printf(USAGE_MAN_TAIL("renice(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index d02ee17ac8eae06c893cf7f17e0e50eb171ebabf..5fe686f5b0bbf1acb221e0a7bc8ba65fc4510de3 100644 (file)
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -115,7 +115,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose            verbose messages\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
        printf(USAGE_MAN_TAIL("rtcwake(8)"));
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index 5280a127136b01add1d037799b04202b33fd70ba..6673825c8b262952760d7ca949fab212efcd1a18 100644 (file)
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -114,7 +114,7 @@ static void __attribute__((__noreturn__)) usage(void)
                fputs(_("     --list               list settable architectures, and exit\n"), stdout);
 
        fputs(USAGE_SEPARATOR, stdout);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
        printf(USAGE_MAN_TAIL("setarch(8)"));
 
        exit(EXIT_SUCCESS);

diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index 1e5c0b499dd7b6a1b900f53c50fe1ccdc7ccb92a..d0123368e2c329fdb80d1e38d84f96c0d04a33ff 100644 (file)
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -139,10 +139,10 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" --apparmor-profile <pr>     set AppArmor profile\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(29);
+       printf(USAGE_HELP_OPTIONS(29));
        fputs(USAGE_SEPARATOR, out);
        fputs(_(" This tool can be dangerous.  Read the manpage, and be careful.\n"), out);
-       fprintf(out, USAGE_MAN_TAIL("setpriv(1)"));
+       printf(USAGE_MAN_TAIL("setpriv(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/setsid.c b/sys-utils/setsid.c
index fddd8a87a397d86db8792a248467644d016f13a3..0b139523220088668064b387ee6494455f8778e3 100644 (file)
--- a/sys-utils/setsid.c
+++ b/sys-utils/setsid.c
@@ -40,9 +40,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -c, --ctty     set the controlling terminal to the current one\n"), out);
        fputs(_(" -w, --wait     wait program to exit, and use the same return\n"), out);
 
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
 
-       fprintf(out, USAGE_MAN_TAIL("setsid(1)"));
+       printf(USAGE_MAN_TAIL("setsid(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index e13fb752b478be5f42a36b064643b5f3195e226e..e5e059d745931634e73955510981befc10d17c55 100644 (file)
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -130,7 +130,7 @@ static void __attribute__((__noreturn__)) usage(void)
                " -v, --verbose          verbose mode\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
 
        fputs(_("\nThe <spec> parameter:\n" \
                " -L <label>             LABEL of device to be used\n" \
@@ -140,7 +140,7 @@ static void __attribute__((__noreturn__)) usage(void)
                " <device>               name of device to be used\n" \
                " <file>                 name of file to be used\n"), out);
 
-       fprintf(out, USAGE_MAN_TAIL("swapoff(8)"));
+       printf(USAGE_MAN_TAIL("swapoff(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 28f3bd8d64196514643a5d3ccda2c5a90b827353..641facb1fdc151d57610c1170bf76fb0008c9da1 100644 (file)
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -808,7 +808,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose            verbose mode\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(26);
+       printf(USAGE_HELP_OPTIONS(26));
 
        fputs(_("\nThe <spec> parameter:\n" \
                " -L <label>             synonym for LABEL=<label>\n"
@@ -829,7 +829,7 @@ static void __attribute__((__noreturn__)) usage(void)
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %-5s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("swapon(8)"));
+       printf(USAGE_MAN_TAIL("swapon(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
index 5c4095966585692ec245dbe7c48550ea106fe56d..87f178c36d9f6ac642175d918d0d47733f462890 100644 (file)
--- a/sys-utils/switch_root.c
+++ b/sys-utils/switch_root.c
@@ -209,8 +209,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Switch to another filesystem as the root of the mount tree.\n"), output);
 
        fputs(USAGE_OPTIONS, output);
-       print_usage_help_options(16);
-       fprintf(output, USAGE_MAN_TAIL("switch_root(8)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("switch_root(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index a03b9a68ab52612f8ead4fc9f5af38a22c6650e2..c6bdc66e9a2e3f42d92085feb83806772a75c472 100644 (file)
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -112,8 +112,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -r, --reset                  reset the port\n"), out);
        fputs(_(" -q, --print-irq <on|off>     display current irq setting\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(30);
-       fprintf(out, USAGE_MAN_TAIL("tunelp(8)"));
+       printf(USAGE_HELP_OPTIONS(30));
+       printf(USAGE_MAN_TAIL("tunelp(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index fd21ca9d75e137a72296a658840acd19ce2993b4..61d9a33ef1c85897dd475013f22ebb9a752b9592 100644 (file)
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -102,8 +102,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -v, --verbose           say what is being done\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
-       fprintf(out, USAGE_MAN_TAIL("umount(8)"));
+       printf(USAGE_HELP_OPTIONS(25));
+       printf(USAGE_MAN_TAIL("umount(8)"));
 
        exit(MNT_EX_SUCCESS);
 }

diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 5060c28395308ad845c4b054db3ee6e558c4e498..b5e0d6608c8241130a5fa000e7f54b932358bd94 100644 (file)
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -265,8 +265,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -s, --setgroups allow|deny  control the setgroups syscall in user namespaces\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(27);
-       fprintf(out, USAGE_MAN_TAIL("unshare(1)"));
+       printf(USAGE_HELP_OPTIONS(27));
+       printf(USAGE_MAN_TAIL("unshare(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index 1b82fc83037159ab639f043bf67dcd5a30500b16..33012dca36a6e24251755f331a46b843412596ea 100644 (file)
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -190,7 +190,7 @@ static void __attribute__((__noreturn__)) usage(void)
                " -x, --flags-only       print only flags table (same as -I -T)\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(24);
+       printf(USAGE_HELP_OPTIONS(24));
        fputs(USAGE_SEPARATOR, out);
 
        fprintf(out, _("The default device is %s.\n"), _PATH_WATCHDOG_DEV);
@@ -199,7 +199,7 @@ static void __attribute__((__noreturn__)) usage(void)
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %13s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("wdctl(8)"));
+       printf(USAGE_MAN_TAIL("wdctl(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 3d604cf68bfdc37b09f534cabf7b897f0c8fe752..aee28cc01d18d4c81576dc161a013368da517cc6 100644 (file)
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -543,13 +543,13 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -t, --streams <number>    number of compression streams\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(27);
+       printf(USAGE_HELP_OPTIONS(27));
 
        fputs(USAGE_COLUMNS, out);
        for (i = 0; i < ARRAY_SIZE(infos); i++)
                fprintf(out, " %11s  %s\n", infos[i].name, _(infos[i].help));
 
-       fprintf(out, USAGE_MAN_TAIL("zramctl(8)"));
+       printf(USAGE_MAN_TAIL("zramctl(8)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 7df5a526816c789e4b6ef4e18eaa353bec518c4a..23cac403e31ec154eff70e534f74ba26076affa2 100644 (file)
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -2112,7 +2112,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --reload               reload prompts on running agetty instances\n"), out);
        printf( "     --help                 %s\n", USAGE_OPTSTR_HELP);
        printf( "     --version              %s\n", USAGE_OPTSTR_VERSION);
-       fprintf(out, USAGE_MAN_TAIL("agetty(8)"));
+       printf(USAGE_MAN_TAIL("agetty(8)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/term-utils/mesg.c b/term-utils/mesg.c
index d5a7f2e29989ca4962051ec202489c13bc3115cb..8714ad1aa38c400943c95c3dbe76be3a0746b682 100644 (file)
--- a/term-utils/mesg.c
+++ b/term-utils/mesg.c
@@ -80,8 +80,8 @@ static void __attribute__((__noreturn__)) usage(void)
 
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -v, --verbose  explain what is being done\n"), out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("mesg(1)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("mesg(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/term-utils/script.c b/term-utils/script.c
index e21affa2be4e1b67315bd1112e34bd0c14344c9c..814ee496197acb28351dad8f26868fe2b0cc198f 100644 (file)
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -172,9 +172,9 @@ static void __attribute__((__noreturn__)) usage(void)
                " -q, --quiet             be quiet\n"
                " -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
                ), out);
-       print_usage_help_options(25);
+       printf(USAGE_HELP_OPTIONS(25));
 
-       fprintf(out, USAGE_MAN_TAIL("script(1)"));
+       printf(USAGE_MAN_TAIL("script(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/term-utils/scriptreplay.c b/term-utils/scriptreplay.c
index 0a22b9cb818b8b551fdfb48f58bb57f7ef61faa7..7b59b6e244b425d787c57b71f655bf9a53a2cb9f 100644 (file)
--- a/term-utils/scriptreplay.c
+++ b/term-utils/scriptreplay.c
@@ -53,9 +53,9 @@ usage(void)
                " -d, --divisor <num>     speed up or slow down execution with time divisor\n"
                " -m, --maxdelay <num>    wait at most this many seconds between updates\n"
                ), out);
-       print_usage_help_options(25);
+       printf(USAGE_HELP_OPTIONS(25));
 
-       fprintf(out, USAGE_MAN_TAIL("scriptreplay(1)"));
+       printf(USAGE_MAN_TAIL("scriptreplay(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 2878bdb96a64e0194a0ba19aff8935eb407e1330..f20a5e6987a0f9ebc16e0cdc8e57fdefa5396fac 100644 (file)
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -421,7 +421,7 @@ static void __attribute__((__noreturn__)) usage(void)
        printf( " --help                            %s\n", USAGE_OPTSTR_HELP);
        printf( " --version                         %s\n", USAGE_OPTSTR_VERSION);
 
-       fprintf(out, USAGE_MAN_TAIL("setterm(1)"));
+       printf(USAGE_MAN_TAIL("setterm(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/term-utils/wall.c b/term-utils/wall.c
index 6e48ab9fd00de6fe59ee9965c49d51b044af8ef7..f57c0835c310a257a600ad2a776da4b5a567ac4b 100644 (file)
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -93,8 +93,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -n, --nobanner          do not print banner, works only for root\n"), out);
        fputs(_(" -t, --timeout <timeout> write timeout in seconds\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
-       fprintf(out, USAGE_MAN_TAIL("wall(1)"));
+       printf(USAGE_HELP_OPTIONS(25));
+       printf(USAGE_MAN_TAIL("wall(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/term-utils/write.c b/term-utils/write.c
index 9f313d8a96eebbef6e24a7e622baa904d248a123..bd64fc281a0872650f3141908bb864f959d8e879 100644 (file)
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -91,8 +91,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Send a message to another user.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("write(1)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("write(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/text-utils/col.c b/text-utils/col.c
index 01ee61b27b115fe03804711bb960fc7b89fdf93c..3d9e15d26573445e937f004a93058e923ab3e27d 100644 (file)
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -151,7 +151,7 @@ static void __attribute__((__noreturn__)) usage(void)
                "%s reads from standard input and writes to standard output\n\n"),
                program_invocation_short_name);
 
-       fprintf(out, USAGE_MAN_TAIL("col(1)"));
+       printf(USAGE_MAN_TAIL("col(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/text-utils/colcrt.c b/text-utils/colcrt.c
index cb6d4456e2e0c155cc4e5f95a5b2dc757b28a3e4..6113880e40a9044fa2e1161b77485fa797cf667c 100644 (file)
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -89,9 +89,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -2, --half-lines        print all half-lines\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(25);
+       printf(USAGE_HELP_OPTIONS(25));
 
-       fprintf(out, USAGE_MAN_TAIL("colcrt(1)"));
+       printf(USAGE_MAN_TAIL("colcrt(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/text-utils/colrm.c b/text-utils/colrm.c
index c2ff039ffb5e922ca687682c83fa685d6b38b3f2..8bb0ee9cce08209edbc6cb887b8da7fb9bba817d 100644 (file)
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -65,10 +65,10 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Filter out the specified columns.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
        fprintf(out, _("%s reads from standard input and writes to standard output\n\n"),
                       program_invocation_short_name);
-       fprintf(out, USAGE_MAN_TAIL("colrm(1)"));
+       printf(USAGE_MAN_TAIL("colrm(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/text-utils/column.c b/text-utils/column.c
index fb57b4748ac16d296cb5abd68108fb9ff8ba85d8..2bb6335cf4560e55fcb5572f61ac3ddee4ee7cb2 100644 (file)
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -589,8 +589,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -x, --fillrows                   fill rows before columns\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(34);
-       fprintf(out, USAGE_MAN_TAIL("column(1)"));
+       printf(USAGE_HELP_OPTIONS(34));
+       printf(USAGE_MAN_TAIL("column(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 57deddaf1e672dd16afef1a1bc3888bc6b63e6ff..94c53b8e520e0aba103d811987ca9153e0ee55d3 100644 (file)
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -174,8 +174,8 @@ void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -s, --skip <offset>       skip offset bytes from the beginning\n"), out);
        fputs(_(" -v, --no-squeezing        output identical lines\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(27);
-       fprintf(out, USAGE_MAN_TAIL("hexdump(1)"));
+       printf(USAGE_HELP_OPTIONS(27));
+       printf(USAGE_MAN_TAIL("hexdump(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/text-utils/line.c b/text-utils/line.c
index a9b3696cf84f8fefa1d645e89872f4fc4c80bb5e..63c001261d91ca7c30dc75db4165b0b76021fb79 100644 (file)
--- a/text-utils/line.c
+++ b/text-utils/line.c
@@ -34,8 +34,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Read one line.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("line(1)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("line(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/text-utils/more.c b/text-utils/more.c
index 2a7917120ed12bb443f9be995fd8a336a65955e8..cbff39b11301ef4866b6c33994af69f4e941e692 100644 (file)
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -249,7 +249,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(USAGE_SEPARATOR, out);
        printf( "     --help     %s\n", USAGE_OPTSTR_HELP);
        printf( " -V, --version  %s\n", USAGE_OPTSTR_VERSION);
-       fprintf(out, USAGE_MAN_TAIL("more(1)"));
+       printf(USAGE_MAN_TAIL("more(1)"));
        exit(EXIT_SUCCESS);
 }
 

diff --git a/text-utils/pg.c b/text-utils/pg.c
index 5c378915aba9d236625b09b8ad9ec25c6c6b0c50..ed9eb415af69cf1ad67f4d1da28dd02a719840b4 100644 (file)
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -247,9 +247,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" +/pattern/   start at the line containing pattern\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(16);
+       printf(USAGE_HELP_OPTIONS(16));
 
-       fprintf(out, USAGE_MAN_TAIL("pg(1)"));
+       printf(USAGE_MAN_TAIL("pg(1)"));
        exit(0);
 }
 

diff --git a/text-utils/rev.c b/text-utils/rev.c
index 3c2bd1f20079bfe7bac5e7d93511b680fda09462..84d116d8c364166631a8359839edabf47cd0496c 100644 (file)
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -81,8 +81,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Reverse lines characterwise.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       print_usage_help_options(16);
-       fprintf(out, USAGE_MAN_TAIL("rev(1)"));
+       printf(USAGE_HELP_OPTIONS(16));
+       printf(USAGE_MAN_TAIL("rev(1)"));
 
        exit(EXIT_SUCCESS);
 }

diff --git a/text-utils/ul.c b/text-utils/ul.c
index 8f1f89e46abc4f3921aacf0535307ad7dc70e49b..b5ce4db845f9621437ed815ad33c44ddf2ca0514 100644 (file)
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -148,9 +148,9 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -t, -T, --terminal TERMINAL  override the TERM environment variable\n"), out);
        fputs(_(" -i, --indicated              underlining is indicated via a separate line\n"), out);
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(30);
+       printf(USAGE_HELP_OPTIONS(30));
 
-       fprintf(out, USAGE_MAN_TAIL("ul(1)"));
+       printf(USAGE_MAN_TAIL("ul(1)"));
 
        exit(EXIT_SUCCESS);
 }