 @@ -1,14 +1,14 @@
-/* $NetBSD: t_parsedate.c,v 1.7.8.4 2014/10/11 16:47:00 snj Exp $ */
+/* $NetBSD: t_parsedate.c,v 1.7.8.5 2014/10/11 16:52:56 snj Exp $ */
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
 @@ -19,84 +19,106 @@
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
  * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_parsedate.c,v 1.7.8.4 2014/10/11 16:47:00 snj Exp $");
+__RCSID("$NetBSD: t_parsedate.c,v 1.7.8.5 2014/10/11 16:52:56 snj Exp $");
 #include <atf-c.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <util.h>
 /*
  * ANY is used as a placeholder for values that do not need to be
  * checked.  The actual value is arbitrary.  We don't use -1
  * because some tests might want to use -1 as a literal value.
  */
 #define ANY -30215
 /* parsecheck --
  * call parsedate(), then call time_to_tm() on the result,
  * and check that year/month/day/hour/minute/second are as expected.
+ *
  * time_to_tm should usually be localtime_r or gmtime_r.
+ *
  * Don't check values specified as ANY.
  */
 static void
 parsecheck(const char *datestr, const time_t *reftime, const int *zoff,
 	struct tm * time_to_tm(const time_t *, struct tm *),
 	int year, int month, int day, int hour, int minute, int second)
+{
 	time_t t;
 	struct tm tm;
 	char argstr[128];
 	/*
 	 * printable version of the args.
+	 *
 	 * Note that printf("%.*d", 0, 0)) prints nothing at all,
 	 * while printf("%.*d", 1, val) prints the value as usual.
 	 */
 	snprintf(argstr, sizeof(argstr), "%s%s%s, %s%.*jd, %s%.*d",
 		/* NULL or \"<datestr>\" */
 		(datestr ? "\"" : ""),
 		(datestr ? datestr : "NULL"),
 		(datestr ? "\"" : ""),
 		/* NULL or *reftime */
 		(reftime ? "" : "NULL"),
 		(reftime ? 1 : 0),
 		(reftime ? (intmax_t)*reftime : (intmax_t)0),
 		/* NULL or *zoff */
 		(zoff ? "" : "NULL"),
 		(zoff ? 1 : 0),
 		(zoff ? *zoff : 0));
 	ATF_CHECK_MSG((t = parsedate(datestr, reftime, zoff)) != -1,
-	    "parsedate(\"%s\",,) returned -1\n", datestr);
+	    "parsedate(%s) returned -1\n", argstr);
 	ATF_CHECK(time_to_tm(&t, &tm) != NULL);
 	if (year != ANY)
 		ATF_CHECK_MSG(tm.tm_year + 1900 == year,
-		    "parsedate(\"%s\",,) expected year %d got %d (+1900)\n",
+		    "parsedate(%s) expected year %d got %d (+1900)\n",
-		    datestr, year, (int)tm.tm_year);
+		    argstr, year, (int)tm.tm_year);
 	if (month != ANY)
 		ATF_CHECK_MSG(tm.tm_mon + 1 == month,
-		    "parsedate(\"%s\",,) expected month %d got %d (+1)\n",
+		    "parsedate(%s) expected month %d got %d (+1)\n",
-		    datestr, month, (int)tm.tm_mon);
+		    argstr, month, (int)tm.tm_mon);
 	if (day != ANY)
 		ATF_CHECK_MSG(tm.tm_mday == day,
-		    "parsedate(\"%s\",,) expected day %d got %d\n",
+		    "parsedate(%s) expected day %d got %d\n",
-		    datestr, day, (int)tm.tm_mday);
+		    argstr, day, (int)tm.tm_mday);
 	if (hour != ANY)
 		ATF_CHECK_MSG(tm.tm_hour == hour,
-		    "parsedate(\"%s\",,) expected hour %d got %d\n",
+		    "parsedate(%s) expected hour %d got %d\n",
-		    datestr, hour, (int)tm.tm_hour);
+		    argstr, hour, (int)tm.tm_hour);
 	if (minute != ANY)
 		ATF_CHECK_MSG(tm.tm_min == minute,
-		    "parsedate(\"%s\",,) expected minute %d got %d\n",
+		    "parsedate(%s) expected minute %d got %d\n",
-		    datestr, minute, (int)tm.tm_min);
+		    argstr, minute, (int)tm.tm_min);
 	if (second != ANY)
 		ATF_CHECK_MSG(tm.tm_sec == second,
-		    "parsedate(\"%s\",,) expected second %d got %d\n",
+		    "parsedate(%s) expected second %d got %d\n",
-		    datestr, second, (int)tm.tm_sec);
+		    argstr, second, (int)tm.tm_sec);
+}
 ATF_TC(dates);
 ATF_TC_HEAD(dates, tc)
+{
 	atf_tc_set_md_var(tc, "descr", "Test unambiguous dates"
 	    " (PR lib/44255)");
+}
 ATF_TC_BODY(dates, tc)
+{