From: zhuk Date: Fri, 23 Oct 2015 11:43:16 +0000 (+0000) Subject: A bit of whitespace cleanup, to make further diffs smaller. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7d75329d78617624ea8a4ef1879cbc5182178e43;p=openbsd A bit of whitespace cleanup, to make further diffs smaller. --- diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index fcab233ec86..a789de2a8d7 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.c,v 1.31 2015/04/18 18:28:37 deraadt Exp $ */ +/* $OpenBSD: calendar.c,v 1.32 2015/10/23 11:43:16 zhuk Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -183,7 +183,7 @@ main(int argc, char *argv[]) if (acstat) { if (chdir(pw->pw_dir) || stat(calendarFile, &sbuf) != 0 || - chdir(calendarHome) || + chdir(calendarHome) || stat(calendarNoMail, &sbuf) == 0 || stat(calendarFile, &sbuf) != 0) exit(0); diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c index 703be4d8cc6..0d73aae3823 100644 --- a/usr.bin/calendar/day.c +++ b/usr.bin/calendar/day.c @@ -1,4 +1,4 @@ -/* $OpenBSD: day.c,v 1.29 2015/03/17 19:31:30 millert Exp $ */ +/* $OpenBSD: day.c,v 1.30 2015/10/23 11:43:16 zhuk Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -286,7 +286,7 @@ isnow(char *endp, int bodun) /* adjust bodun rate */ if (bodun && !bodun_always) bodun = !arc4random_uniform(3); - + /* Easter or Easter depending days */ if (flags & F_SPECIAL) vwd = v1; diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index 7e4b3719745..0d8b679c605 100644 --- a/usr.bin/calendar/io.c +++ b/usr.bin/calendar/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.40 2015/10/23 11:01:30 zhuk Exp $ */ +/* $OpenBSD: io.c,v 1.41 2015/10/23 11:43:16 zhuk Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -163,13 +163,13 @@ cal(void) var = 0; if (printing) { struct match *foo; - + ev1 = NULL; while (m) { cur_evt = malloc(sizeof(struct event)); if (cur_evt == NULL) err(1, NULL); - + cur_evt->when = m->when; snprintf(cur_evt->print_date, sizeof(cur_evt->print_date), "%s%c", @@ -302,7 +302,7 @@ getfield(char *p, char **endp, int *flags) * number of special events. */ break; } - *flags |= F_SPECIAL; + *flags |= F_SPECIAL; } if (!(*flags & F_SPECIAL)) { /* undefined rest */ @@ -354,7 +354,7 @@ opencal(void) (void)close(pdes[1]); } (void)close(pdes[0]); - /* + /* * Set stderr to /dev/null. Necessary so that cron does not * wait for cpp to finish if it's running calendar -a. */