From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 10 Nov 2013 18:23:32 +0000 (+0000)
Subject: cal: simplify ascii_weeknum() function
X-Git-Tag: v2.25-rc1~691
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44df9bd4bffd7ccbb1934c7dcc6d84527dd43ce9;p=thirdparty%2Futil-linux.git

cal: simplify ascii_weeknum() function

Either the week is or isn't highlighted, there is no need to over
complicate printing of that.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 748288de32..c1bbdce89d 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -970,12 +970,9 @@ static char *ascii_day(char *p, int day, const struct cal_control *ctl)
 static char *ascii_weeknum(char *p, int weeknum, const struct cal_control *ctl)
 {
 	if ((ctl->weektype & WEEK_NUM_MASK) == weeknum)
-		p += sprintf(p,"%s",Senter);
-	p += sprintf(p,"%2d",weeknum);
-	if ((ctl->weektype & WEEK_NUM_MASK) == weeknum)
-		p += sprintf(p,"%s ",Sexit);
+		p += sprintf(p, "%s%2d%s ", Senter, weeknum, Sexit);
 	else
-		p += sprintf(p," ");
+		p += sprintf(p, "%2d ", weeknum);
 	return p;
 }