10 files changed, 17 insertions, 17 deletions
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 7d14e7b4c..c5312fa0c 100644
--- 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 9b19b84f0..4721c870e 100644
--- 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 1218a3018..ae0d4c9c7 100644
--- 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 8b9933eb7..186ec6cbd 100644
--- 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 ce3fefbc1..7358ba112 100644
--- 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 44604dc77..b0b6a721c 100644
--- 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 574d98e22..314f60abe 100644
--- 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 45f6cfa4c..49b949a90 100644
--- 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 41d6c3b1a..00c44b8db 100644
--- 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 e5614af65..5999d8d15 100644
--- 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);
 }