about summary refs log tree commit diff
path: root/timezone/zic.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-12-05 19:19:20 +0000
committerUlrich Drepper <drepper@redhat.com>2001-12-05 19:19:20 +0000
commit29132b91519572e6076003735cd6f718ff2e1369 (patch)
tree99ce33e32f1bf5e86d5a68639650498648face1c /timezone/zic.c
parent350b053ae97f0764a5910fbf4fc168cb1216efbd (diff)
downloadglibc-29132b91519572e6076003735cd6f718ff2e1369.tar.gz
glibc-29132b91519572e6076003735cd6f718ff2e1369.tar.xz
glibc-29132b91519572e6076003735cd6f718ff2e1369.zip
Update.
	* iconvdata/ibm1129.h: Remove duplicate mappings.
	* iconvdata/ibm937.c: Handle overflow errors.  Handle new tables.
	* iconvdata/ibm937.h: Reorganize table to safe a lot of space.
	Patch by Masahide Washizawa <WASHI@jp.ibm.com>.

	* timezone/zic.c: Fix handling of turnaround times.
	Patch by Arthur David Olson <olsona@dc37a.nci.nih.gov>.

2001-12-02  Moshe Olshansky  <OLSHANSK@il.ibm.com>

	* sysdeps/ieee754/dbl-64/e_remainder.c (__ieee754_remainder): Fix
	overflow problem.

2001-12-05  Ulrich Drepper  <drepper@redhat.com>

	* posix/regex.c: For use outside glibc defined bounded pointer
	macros here.  Patch by Jim Meyering <jim@meyering.net>.
Diffstat (limited to 'timezone/zic.c')
-rw-r--r--timezone/zic.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/timezone/zic.c b/timezone/zic.c
index 8e028ebb92..6fdcfcb66a 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)zic.c	7.102";
+static char	elsieid[] = "@(#)zic.c	7.104";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -1616,16 +1616,16 @@ const int			zonecount;
 	typecnt = 0;
 	charcnt = 0;
 	/*
-	** A guess that may well be corrected later.
-	*/
-	stdoff = 0;
-	/*
 	** Thanks to Earl Chew (earl@dnd.icp.nec.com.au)
 	** for noting the need to unconditionally initialize startttisstd.
 	*/
 	startttisstd = FALSE;
 	startttisgmt = FALSE;
 	for (i = 0; i < zonecount; ++i) {
+		/*
+		** A guess that may well be corrected later.
+		*/
+		stdoff = 0;
 		zp = &zpfirst[i];
 		usestart = i > 0 && (zp - 1)->z_untiltime > min_time;
 		useuntil = i < (zonecount - 1);
@@ -1645,8 +1645,7 @@ const int			zonecount;
 			if (usestart) {
 				addtt(starttime, type);
 				usestart = FALSE;
-			}
-			else if (stdoff != 0)
+			} else if (stdoff != 0)
 				addtt(min_time, type);
 		} else for (year = min_year; year <= max_year; ++year) {
 			if (useuntil && year > zp->z_untilrule.r_hiyear)