From: Karel Zak <kzak@redhat.com>
Date: Thu, 31 Aug 2017 08:31:21 +0000 (+0200)
Subject: rfkill: cleanup usage()
X-Git-Tag: v2.31-rc1~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcc3efb40e5b133a54ca8551a6d001ba43c06790;p=thirdparty%2Futil-linux.git

rfkill: cleanup usage()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/rfkill.c b/sys-utils/rfkill.c
index 08002b44f0..7a32c70b29 100644
--- a/sys-utils/rfkill.c
+++ b/sys-utils/rfkill.c
@@ -454,15 +454,14 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -r, --raw              use the raw output format\n"), stdout);
 
 	fputs(USAGE_SEPARATOR, stdout);
-	print_usage_help_options(24);
+	printf(USAGE_HELP_OPTIONS(24));
 
-	fputs(USAGE_SEPARATOR, stdout);
-	fputs(_("Available columns:\n"), stdout);
+	fputs(USAGE_COLUMNS, stdout);
 	for (i = 0; i < ARRAY_SIZE(infos); i++)
 		fprintf(stdout, " %-6s  %s\n", infos[i].name, _(infos[i].help));
 
-	fputs(USAGE_SEPARATOR, stdout);
-	fputs(_("Commands:\n"), stdout);
+	fputs(USAGE_COMMANDS, stdout);
+
 	/*
 	 * TRANSLATORS: command names should not be translated, explaining
 	 * them as additional field after identifer is fine, for example