From: Karel Zak <kzak@redhat.com>
Date: Tue, 16 Aug 2011 11:37:05 +0000 (+0200)
Subject: partx: cleanup usage()
X-Git-Tag: v2.20-rc2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e96fd1766df8ad5453c21e291747384ec284e4be;p=thirdparty%2Futil-linux.git

partx: cleanup usage()

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

diff --git a/partx/partx.c b/partx/partx.c
index 0b35f9f482..e438879157 100644
--- a/partx/partx.c
+++ b/partx/partx.c
@@ -578,14 +578,13 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 {
 	int i;
 
-	fprintf(out, _(
-		"\nUsage:\n"
-		" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"),
+	fputs(_("\nUsage:\n"), out);
+	fprintf(out,
+	      _(" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"),
 		program_invocation_short_name);
 
-	fprintf(out, _(
-		"\nOptions:\n"
-		" -a, --add            add specified partitions or all of them\n"
+	fputs(_("\nOptions:\n"), out);
+	fputs(_(" -a, --add            add specified partitions or all of them\n"
 		" -d, --delete         delete specified partitions or all of them\n"
 		" -l, --list           list partitions (DEPRECATED)\n"
 		" -s, --show           list partitions\n\n"
@@ -597,9 +596,9 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 		" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
 		" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
 		" -o, --output <LIST>  define which output columns to use\n"
-		" -h, --help           print this help\n\n"));
+		" -h, --help           print this help\n"), out);
 
-	fprintf(out, _("\nAvailable columns (for --show, --raw or --pairs):\n"));
+	fputs(_("\nAvailable columns (for --show, --raw or --pairs):\n"), out);
 
 	for (i = 0; i < __NCOLUMNS; i++)
 		fprintf(out, " %10s  %s\n", infos[i].name, _(infos[i].help));