[PATCH 05/13] cal: simplify ascii_weeknum() function

Sami Kerola
2013-11-10T18:24:57Z

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>
---
misc-utils/cal.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 748288d..c1bbdce 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;
}

--
1.8.4.2