]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
cal: simplify colormode parsing
authorKarel Zak <kzak@redhat.com>
Tue, 28 May 2013 13:27:22 +0000 (15:27 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 28 May 2013 13:27:22 +0000 (15:27 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
misc-utils/cal.c

index 0142fd0ec06face3f6adf28ceac03f5b5a684b28..c7c2fee7e6b6f54f4ecf538a785dc159c0fc179a 100644 (file)
@@ -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);