From: Karel Zak <kzak@redhat.com>
Date: Tue, 20 May 2014 09:56:43 +0000 (+0200)
Subject: setterm: fix 'bright' in usage, remove unnecessary error message
X-Git-Tag: v2.25-rc1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2832032772bb8d0a6ec9dda84c23db5d60a9f700;p=thirdparty%2Futil-linux.git

setterm: fix 'bright' in usage, remove unnecessary error message

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

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index edaf6b85dc..5f59a8b260 100644
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -398,9 +398,6 @@ static int parse_bfreq(char **argv, char *optarg, int *optind)
 
 static void __attribute__((__noreturn__)) usage(FILE *out)
 {
-	if (out == stderr)
-		warnx(_("argument error"));
-
 	fputs(USAGE_HEADER, out);
 	fprintf(out,
 	      _(" %s [options]\n"), program_invocation_short_name);
@@ -415,8 +412,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	fputs(_(" --default\n"), out);
 	fputs(_(" --foreground <default|color>\n"), out);
 	fputs(_(" --background <default|color>\n"), out);
-	fputs(_(" --ulcolor <bright> <color>\n"), out);
-	fputs(_(" --hbcolor <bright> <color>\n"), out);
+	fputs(_(" --ulcolor [bright] <color>\n"), out);
+	fputs(_(" --hbcolor [bright] <color>\n"), out);
 	fputs(_(" <color>: black blue cyan green grey magenta red white yellow\n"), out);
 	fputs(_(" --inversescreen <on|off>\n"), out);
 	fputs(_(" --bold <on|off>\n"), out);