Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Sep 2010 07:48:01 +0000 (UTC)
From:      Edwin Groothuis <edwin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r212353 - in vendor/tzcode/dist: libc/stdtime unused zic
Message-ID:  <201009090748.o897m18J048492@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: edwin
Date: Thu Sep  9 07:48:01 2010
New Revision: 212353
URL: http://svn.freebsd.org/changeset/base/212353

Log:
  Vendor import of tzcode2010l

Modified:
  vendor/tzcode/dist/libc/stdtime/localtime.c
  vendor/tzcode/dist/unused/tz-link.htm
  vendor/tzcode/dist/zic/zdump.c

Modified: vendor/tzcode/dist/libc/stdtime/localtime.c
==============================================================================
--- vendor/tzcode/dist/libc/stdtime/localtime.c	Thu Sep  9 06:44:22 2010	(r212352)
+++ vendor/tzcode/dist/libc/stdtime/localtime.c	Thu Sep  9 07:48:01 2010	(r212353)
@@ -5,7 +5,7 @@
 
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)localtime.c	8.13";
+static char	elsieid[] = "@(#)localtime.c	8.14";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -274,34 +274,28 @@ settzname(void)
 		return;
 	}
 #endif /* defined ALL_STATE */
-	for (i = 0; i < sp->typecnt; ++i) {
-		register const struct ttinfo * const	ttisp = &sp->ttis[i];
+	/*
+	** And to get the latest zone names into tzname. . .
+	*/
+	for (i = 0; i < sp->timecnt; ++i) {
+		register const struct ttinfo * const	ttisp =
+							&sp->ttis[
+								sp->types[i]];
 
 		tzname[ttisp->tt_isdst] =
 			&sp->chars[ttisp->tt_abbrind];
 #ifdef USG_COMPAT
 		if (ttisp->tt_isdst)
 			daylight = 1;
-		if (i == 0 || !ttisp->tt_isdst)
+		if (!ttisp->tt_isdst)
 			timezone = -(ttisp->tt_gmtoff);
 #endif /* defined USG_COMPAT */
 #ifdef ALTZONE
-		if (i == 0 || ttisp->tt_isdst)
+		if (ttisp->tt_isdst)
 			altzone = -(ttisp->tt_gmtoff);
 #endif /* defined ALTZONE */
 	}
 	/*
-	** And to get the latest zone names into tzname. . .
-	*/
-	for (i = 0; i < sp->timecnt; ++i) {
-		register const struct ttinfo * const	ttisp =
-							&sp->ttis[
-								sp->types[i]];
-
-		tzname[ttisp->tt_isdst] =
-			&sp->chars[ttisp->tt_abbrind];
-	}
-	/*
 	** Finally, scrub the abbreviations.
 	** First, replace bogus characters.
 	*/

Modified: vendor/tzcode/dist/unused/tz-link.htm
==============================================================================
--- vendor/tzcode/dist/unused/tz-link.htm	Thu Sep  9 06:44:22 2010	(r212352)
+++ vendor/tzcode/dist/unused/tz-link.htm	Thu Sep  9 07:48:01 2010	(r212353)
@@ -18,7 +18,7 @@
 <body>
 <h1>Sources for Time Zone and Daylight Saving Time Data</h1>
 <address>
-@(#)tz-link.htm	8.26
+@(#)tz-link.htm	8.30
 </address>
 <p>
 This file is in the public domain, so clarified as of
@@ -89,6 +89,8 @@ the code is in the file <code>tzcode<var
 where <code><var>C</var></code> is the code's version;
 similarly, the data are in <code>tzdata<var>D</var>.tar.gz</code>,
 where <code><var>D</var></code> is the data's version.
+Each version is a four-digit year followed by lower-case letters
+(a through z, then za through zz, then zza through zzz, and so on).
 The following <a
 href="http://en.wikipedia.org/wiki/Unix_shell">shell</a>; commands download
 these files to a <abbr>GNU</abbr>/Linux or similar host;
@@ -349,6 +351,17 @@ href="http://unicode.org/cldr/data/diff/
 &rarr; Tzid table</a> maintained by the <abbr
 title="Common Locale Data Repository">CLDR</abbr> data mentioned
 below.</li>
+<li>
+<a href="http://code.google.com/p/tzdata/">;
+http://code.google.com/p/tzdata/
+</a>
+provides programming-language-specific representations of timezone
+data. Currently this includes XML, PHP, Ruby, Javascript, JSON and CSV
+formatted data. The repository is updated as soon as the FTP
+distribution is updated. All data can be downloaded as a zip and/or it
+can be obtained/synced via anonymous SVN. Data is made available under
+the MIT license. (From Rich Tibbett.)
+</li>
 </ul>
 <h2>Maps</h2>
 <ul>

Modified: vendor/tzcode/dist/zic/zdump.c
==============================================================================
--- vendor/tzcode/dist/zic/zdump.c	Thu Sep  9 06:44:22 2010	(r212352)
+++ vendor/tzcode/dist/zic/zdump.c	Thu Sep  9 07:48:01 2010	(r212353)
@@ -238,7 +238,7 @@ const char * const	zone;
 static void
 usage(stream, status)
 FILE * const	stream;
-const int	status
+const int	status;
 {
 	(void) fprintf(stream,
 _("%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009090748.o897m18J048492>