[PATCH 3/4] zramctl: restore normal description indentations in the usage text

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit 19c12e63b1 from four months ago changed the indentation of *all*
the option descriptions in the usage text.  That was the wrong thing to
do, as it invalidates all existing translations for no good reason.

When one of the options is (or needs to become) overlong, then the thing
to do is: to put the description of this option on the next line.

So, restore the indentation of the descriptions to what they were
before commit 19c12e63b1, and wrap the description of -p.

Also, make the description of -b fit within 80 columns, and sort the
options better: alphabetically, but single letter before long option.

CC: LiviaMedeiros <livia@xxxxxxxxxx>
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxx>
---
 sys-utils/zramctl.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 36cc55ff9..b9ea5998e 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -745,17 +745,18 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_("Set up and control zram devices.\n"), out);
 
 	fputs(USAGE_OPTIONS, out);
-	fputs(_(" -a, --algorithm <alg>              compression algorithm to use\n"), out);
-	fputs(_(" -b, --bytes                        print sizes in bytes rather than in human readable format\n"), out);
-	fputs(_(" -f, --find                         find a free device\n"), out);
-	fputs(_(" -n, --noheadings                   don't print headings\n"), out);
-	fputs(_(" -o, --output <list>                columns to use for status output\n"), out);
-	fputs(_("     --output-all                   output all columns\n"), out);
-	fputs(_(" -p, --algorithm-params <params>    algorithm parameters to use\n"), out);
-	fputs(_("     --raw                          use raw status output format\n"), out);
-	fputs(_(" -r, --reset                        reset all specified devices\n"), out);
-	fputs(_(" -s, --size <size>                  device size\n"), out);
-	fputs(_(" -t, --streams <number>             number of compression streams\n"), out);
+	fputs(_(" -a, --algorithm <alg>     compression algorithm to use\n"), out);
+	fputs(_(" -b, --bytes               print sizes in bytes, not in human-readable form\n"), out);
+	fputs(_(" -f, --find                find a free device\n"), out);
+	fputs(_(" -n, --noheadings          don't print headings\n"), out);
+	fputs(_(" -o, --output <list>       columns to use for status output\n"), out);
+	fputs(_("     --output-all          output all columns\n"), out);
+	fputs(_(" -p, --algorithm-params <parameters>\n"
+		"                           parameters for the compression algorithm\n"), out);
+	fputs(_(" -r, --reset               reset all specified devices\n"), out);
+	fputs(_("     --raw                 use raw status output format\n"), out);
+	fputs(_(" -s, --size <size>         device size\n"), out);
+	fputs(_(" -t, --streams <number>    number of compression streams\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
 	fprintf(out, USAGE_HELP_OPTIONS(27));
-- 
2.48.1





[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux