From: Karel Zak <kzak@redhat.com>
Date: Tue, 28 May 2013 13:27:22 +0000 (+0200)
Subject: cal: simplify colormode parsing
X-Git-Tag: v2.24-rc1~534
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=201b39f0019ae0fab34459bf6ec8b86773fb0b72;p=thirdparty%2Futil-linux.git

cal: simplify colormode parsing

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

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 0142fd0ec0..c7c2fee7e6 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -346,12 +346,9 @@ main(int argc, char **argv) {
 			yflag = 1;
 			break;
 		case OPT_COLOR:
-			if (optarg) {
-				char *p = *optarg == '=' ? optarg + 1 : optarg;
-				colormode = colormode_from_string(p);
-				if (colormode < 0)
-					errx(EXIT_FAILURE, _("unsupported color mode: '%s'"), p);
-			}
+			if (optarg)
+				colormode = colormode_or_err(optarg,
+						_("unsupported color mode"));
 			break;
 		case 'V':
 			printf(UTIL_LINUX_VERSION);