From: Karel Zak <kzak@redhat.com>
Date: Fri, 7 Oct 2016 13:24:32 +0000 (+0200)
Subject: cal: remove err message from monthname_to_number()
X-Git-Tag: v2.29-rc2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c49fb9cacdce5ba5c26793f5375e7778fb41601d;p=thirdparty%2Futil-linux.git

cal: remove err message from monthname_to_number()

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

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index ee8fafb7cb..aaa2943e66 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -429,8 +429,12 @@ int main(int argc, char **argv)
 	case 2:
 		if (isdigit(**argv))
 			ctl.req.month = strtos32_or_err(*argv++, _("illegal month value: use 1-12"));
-		else
-			ctl.req.month = monthname_to_number(&ctl, *argv++);
+		else {
+			ctl.req.month = monthname_to_number(&ctl, *argv);
+			if (ctl.req.month < 0)
+				errx(EXIT_FAILURE, _("unknown month name: %s"), *argv);
+			argv++;
+		}
 		if (ctl.req.month < 1 || MONTHS_IN_YEAR < ctl.req.month)
 			errx(EXIT_FAILURE, _("illegal month value: use 1-12"));
 		/* FALLTHROUGH */
@@ -549,7 +553,7 @@ static int monthname_to_number(struct cal_control *ctl, const char *name)
 		if (strcasecmp(ctl->full_month[i], name) == 0)
 			return i + 1;
 
-	errx(EXIT_FAILURE, _("unknown month name: %s"), name);
+	return -EINVAL;
 }
 
 static void headers_init(struct cal_control *ctl)