Merge branch 'help' of https://github.com/rudimeier/util-linux

* 'help' of https://github.com/rudimeier/util-linux:
  setpriv: silence compiler warning
  misc: consolidate macro style USAGE_HELP_OPTIONS
  blockdev: correct man page name in --help

7 files changed, 12 insertions, 12 deletions

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 7df5a5268..23cac403e 100644
--- 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 d5a7f2e29..8714ad1aa 100644
--- 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 e21affa2b..814ee4961 100644
--- 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 0a22b9cb8..7b59b6e24 100644
--- 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 2878bdb96..f20a5e698 100644
--- 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 6e48ab9fd..f57c0835c 100644
--- 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 9f313d8a9..bd64fc281 100644
--- 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);
 }