Simplify test for closing delimiter of #include argument (no functional

change).

While here: Fix invalid parameters of a commented-out debug printf() found
when testing with this code enabled.

MFC after:	3 days

2 files changed, 6 insertions, 19 deletions

diff --git a/usr.bin/calendar/events.c b/usr.bin/calendar/events.c
index 84f8f2b41a8bc..39ede509e4dbe 100644
--- a/usr.bin/calendar/events.c
+++ b/usr.bin/calendar/events.c
@@ -207,8 +207,9 @@ event_print_all(FILE *fp)
 
 	while (walkthrough_dates(&e) != 0) {
 #ifdef DEBUG
-		fprintf(stderr, "event_print_allmonth: %d, day: %d\n",
-		    month, day);
+		if (e)
+			fprintf(stderr, "event_print_all month: %d, day: %d\n",
+			    e->month, e->day);
 #endif
 
 		/*
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 6efbc5ca72a59..f0abd363db35d 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -215,26 +215,12 @@ token(char *line, FILE *out, int *skip)
 			return (T_ERR);
 		}
 
-		a = *walk;
+		a = *walk == '<' ? '>' : '\"';
 		walk++;
 		c = walk[strlen(walk) - 1];
 
-		switch(c) {
-		case '>':
-			if (a != '<') {
-				warnx("Unterminated include expecting '\"'");
-				return (T_ERR);
-			}
-			break;
-		case '\"':
-			if (a != '\"') {
-				warnx("Unterminated include expecting '>'");
-				return (T_ERR);
-			}
-			break;
-		default:
-			warnx("Unterminated include expecting '%c'",
-			    a == '<' ? '>' : '\"' );
+		if (a != c) {
+			warnx("Unterminated include expecting '%c'", a);
 			return (T_ERR);
 		}
 		walk[strlen(walk) - 1] = '\0';