Module Name: src
Committed By: christos
Date: Sat Aug 16 16:22:21 UTC 2014
Modified Files:
src/lib/libc/time: localtime.c private.h zdump.c zic.c
Log Message:
Reduce diffs with upstream by automatically defining INITIALIZE as it was
intended.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/time/private.h \
src/lib/libc/time/zdump.c
cvs rdiff -u -r1.48 -r1.49 src/lib/libc/time/zic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.84 src/lib/libc/time/localtime.c:1.85
--- src/lib/libc/time/localtime.c:1.84 Fri Aug 15 09:20:29 2014
+++ src/lib/libc/time/localtime.c Sat Aug 16 12:22:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.84 2014/08/15 13:20:29 martin Exp $ */
+/* $NetBSD: localtime.c,v 1.85 2014/08/16 16:22:21 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.84 2014/08/15 13:20:29 martin Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.85 2014/08/16 16:22:21 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -962,13 +962,6 @@ transtime(const int year, const struct r
for (i = 0; i < rulep->r_mon - 1; ++i)
value += mon_lengths[leapyear][i] * SECSPERDAY;
break;
- default:
- _DIAGASSERT(
- rulep->r_type == JULIAN_DAY ||
- rulep->r_type == DAY_OF_YEAR ||
- rulep->r_type == MONTH_NTH_DAY_OF_WEEK);
- value = 0;
- break;
}
/*
Index: src/lib/libc/time/private.h
diff -u src/lib/libc/time/private.h:1.34 src/lib/libc/time/private.h:1.35
--- src/lib/libc/time/private.h:1.34 Fri Aug 15 07:04:07 2014
+++ src/lib/libc/time/private.h Sat Aug 16 12:22:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: private.h,v 1.34 2014/08/15 11:04:07 christos Exp $ */
+/* $NetBSD: private.h,v 1.35 2014/08/16 16:22:21 christos Exp $ */
#ifndef PRIVATE_H
#define PRIVATE_H
@@ -354,7 +354,7 @@ const char * scheck(const char * string,
** INITIALIZE(x)
*/
-#ifdef lint
+#if defined(__GNUC__) || defined(__lint__)
# define INITIALIZE(x) ((x) = 0)
#else
# define INITIALIZE(x)
Index: src/lib/libc/time/zdump.c
diff -u src/lib/libc/time/zdump.c:1.34 src/lib/libc/time/zdump.c:1.35
--- src/lib/libc/time/zdump.c:1.34 Fri Aug 15 07:04:07 2014
+++ src/lib/libc/time/zdump.c Sat Aug 16 12:22:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: zdump.c,v 1.34 2014/08/15 11:04:07 christos Exp $ */
+/* $NetBSD: zdump.c,v 1.35 2014/08/16 16:22:21 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2009-05-17 by Arthur David Olson.
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: zdump.c,v 1.34 2014/08/15 11:04:07 christos Exp $");
+__RCSID("$NetBSD: zdump.c,v 1.35 2014/08/16 16:22:21 christos Exp $");
#endif /* !defined lint */
#include "version.h"
@@ -175,11 +175,11 @@ enum { SECSPER400YEARS_FITS = SECSPERLYE
#endif
#ifndef INITIALIZE
-#ifdef GNUC_or_lint
+#if defined(__GNUC__) || defined(__lint__)
#define INITIALIZE(x) ((x) = 0)
-#else /* !defined GNUC_or_lint */
+#else /* !defined GNUC || lint */
#define INITIALIZE(x)
-#endif /* !defined GNUC_or_lint */
+#endif /* !defined GNUC || lint */
#endif /* !defined INITIALIZE */
/*
Index: src/lib/libc/time/zic.c
diff -u src/lib/libc/time/zic.c:1.48 src/lib/libc/time/zic.c:1.49
--- src/lib/libc/time/zic.c:1.48 Sat Aug 16 06:38:43 2014
+++ src/lib/libc/time/zic.c Sat Aug 16 12:22:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: zic.c,v 1.48 2014/08/16 10:38:43 christos Exp $ */
+/* $NetBSD: zic.c,v 1.49 2014/08/16 16:22:21 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2006-07-17 by Arthur David Olson.
@@ -10,7 +10,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: zic.c,v 1.48 2014/08/16 10:38:43 christos Exp $");
+__RCSID("$NetBSD: zic.c,v 1.49 2014/08/16 16:22:21 christos Exp $");
#endif /* !defined lint */
#include "version.h"
@@ -2176,7 +2176,6 @@ outzone(const struct zone *const zpfirst
envvar = emalloc(max_envvar_len + 1);
INITIALIZE(untiltime);
INITIALIZE(starttime);
- starttime = 0; /* XXX: gcc */
/*
** Now. . .finally. . .generate some useful data!
*/
@@ -2318,7 +2317,7 @@ outzone(const struct zone *const zpfirst
zic_t offset;
INITIALIZE(ktime);
- ktime = 0; /* XXX: gcc */
+ ktime = 0;
if (useuntil) {
/*
** Turn untiltime into UT
@@ -2332,8 +2331,7 @@ outzone(const struct zone *const zpfirst
if (!zp->z_untilrule.r_todisstd)
untiltime = tadd(untiltime,
-stdoff);
- } else
- untiltime = 0; /* XXX: gcc */
+ }
/*
** Find the rule (of those to do, if any)
** that takes effect earliest in the year.
