- tz - lists.iana.org

[PATCH] Simplify some ALL_STATE and PCTS ifdefs.
by Paul Eggert Jan. 18, 2014

Jan. 18, 2014

* Makefile (GCC_DEBUG_FLAGS): Add -Wno-address and -Wno-cast-qual. Otherwise, GCC 4.8.1 complains about some of the following changes. * localtime.c (wildabbr): Now const. This is a tiny bit more efficient, POSIX allows it, and the ALL_STATE simplifications below make use of it. All uses changed to cast if needed. (settzname, tzload, localsub, gmtsub, timesub, time2sub, time1): Protect less code with ALL_STATE; this is simpler and doesn't change behavior (or, these days, efficiency). (time1): Simplify the PCTS ifdef, and explain what PCTS is. --- Makefile | 2 +- localtime.c | 53 ++++++++++++----------------------------------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index 40bbbff..ab3cc6b 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ -Wbad-function-cast -Wcast-align -Wcast-qual \ -Wformat=2 -Winit-self \ -Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes \ - -Wnested-externs \ + -Wnested-externs -Wno-address -Wno-cast-qual \ -Wno-format-nonliteral -Wno-sign-compare -Wno-sign-conversion \ -Wno-type-limits \ -Wno-unused-parameter -Woverlength-strings -Wpointer-arith \ diff --git a/localtime.c b/localtime.c index 57d7d83..ff07c70 100644 --- a/localtime.c +++ b/localtime.c @@ -61,7 +61,7 @@ #define WILDABBR " " #endif /* !defined WILDABBR */ -static char wildabbr[] = WILDABBR; +static const char wildabbr[] = WILDABBR; static const char gmt[] = "GMT"; @@ -201,8 +201,8 @@ static int lcl_is_set; static int gmt_is_set; char * tzname[2] = { - wildabbr, - wildabbr + (char *) wildabbr, + (char *) wildabbr }; /* @@ -254,8 +254,7 @@ settzname(void) register struct state * const sp = lclptr; register int i; - tzname[0] = wildabbr; - tzname[1] = wildabbr; + tzname[0] = tzname[1] = (char *) wildabbr; #ifdef USG_COMPAT daylight = 0; timezone = 0; @@ -263,12 +262,10 @@ settzname(void) #ifdef ALTZONE altzone = 0; #endif /* defined ALTZONE */ -#ifdef ALL_STATE if (sp == NULL) { - tzname[0] = tzname[1] = gmt; + tzname[0] = tzname[1] = (char *) gmt; return; } -#endif /* defined ALL_STATE */ /* ** And to get the latest zone names into tzname. . . */ @@ -347,10 +344,8 @@ tzload(register const char *name, register struct state *const sp, sp->goback = sp->goahead = FALSE; -#ifdef ALL_STATE if (up == NULL) return -1; -#endif if (name == NULL && (name = TZDEFAULT) == NULL) goto oops; @@ -1268,10 +1263,8 @@ localsub(const time_t *const timep, const int_fast32_t offset, const time_t t = *timep; sp = lclptr; -#ifdef ALL_STATE if (sp == NULL) return gmtsub(timep, offset, tmp); -#endif /* defined ALL_STATE */ if ((sp->goback && t < sp->ats[0]) || (sp->goahead && t > sp->ats[sp->timecnt - 1])) { time_t newt = t; @@ -1366,8 +1359,8 @@ gmtsub(const time_t *const timep, const int_fast32_t offset, gmt_is_set = TRUE; #ifdef ALL_STATE gmtptr = malloc(sizeof *gmtptr); - if (gmtptr != NULL) #endif /* defined ALL_STATE */ + if (gmtptr != NULL) gmtload(gmtptr); } result = timesub(timep, offset, gmtptr, tmp); @@ -1377,18 +1370,7 @@ gmtsub(const time_t *const timep, const int_fast32_t offset, ** "UT+xxxx" or "UT-xxxx" if offset is non-zero, ** but this is no time for a treasure hunt. */ - if (offset != 0) - tmp->TM_ZONE = wildabbr; - else { -#ifdef ALL_STATE - if (gmtptr == NULL) - tmp->TM_ZONE = gmt; - else tmp->TM_ZONE = gmtptr->chars; -#endif /* defined ALL_STATE */ -#ifndef ALL_STATE - tmp->TM_ZONE = gmtptr->chars; -#endif /* State Farm */ - } + tmp->TM_ZONE = offset ? wildabbr : gmtptr ? gmtptr->chars : gmt; #endif /* defined TM_ZONE */ return result; } @@ -1448,12 +1430,7 @@ timesub(const time_t *const timep, const int_fast32_t offset, corr = 0; hit = 0; -#ifdef ALL_STATE i = (sp == NULL) ? 0 : sp->leapcnt; -#endif /* defined ALL_STATE */ -#ifndef ALL_STATE - i = sp->leapcnt; -#endif /* State Farm */ while (--i >= 0) { lp = &sp->lsis[i]; if (*timep >= lp->ls_trans) { @@ -1827,10 +1804,8 @@ time2sub(struct tm *const tmp, */ sp = (const struct state *) ((funcp == localsub) ? lclptr : gmtptr); -#ifdef ALL_STATE if (sp == NULL) return WRONG; -#endif /* defined ALL_STATE */ for (i = sp->typecnt - 1; i >= 0; --i) { if (sp->ttis[i].tt_isdst != yourtm.tm_isdst) continue; @@ -1903,17 +1878,15 @@ time1(struct tm *const tmp, if (tmp->tm_isdst > 1) tmp->tm_isdst = 1; t = time2(tmp, funcp, offset, &okay); -#ifdef PCTS - /* - ** PCTS code courtesy Grant Sullivan. - */ if (okay) return t; if (tmp->tm_isdst < 0) +#ifdef PCTS + /* + ** POSIX Conformance Test Suite code courtesy Grant Sullivan. + */ tmp->tm_isdst = 0; /* reset to std and try again */ -#endif /* defined PCTS */ -#ifndef PCTS - if (okay || tmp->tm_isdst < 0) +#else return t; #endif /* !defined PCTS */ /* @@ -1923,10 +1896,8 @@ time1(struct tm *const tmp, ** type they need. */ sp = (const struct state *) ((funcp == localsub) ? lclptr : gmtptr); -#ifdef ALL_STATE if (sp == NULL) return WRONG; -#endif /* defined ALL_STATE */ for (i = 0; i < sp->typecnt; ++i) seen[i] = FALSE; nseen = 0; -- 1.8.3.2

1 0

Russia back to "winter time" soon
by Steffen Thorsen Jan. 18, 2014

Jan. 18, 2014

According to this news source, Russia will most likely set clocks one hour back this spring, the bill will be submitted on January 20th, hopefully with the date for the change. "Russia to return winter time after Sochi Olympics": http://rt.com/politics/russia-winter-time-sochi-574/ Best regards, Steffen Thorsen - timeanddate.com

2 1

Regarding Asia/Calcutta
by Peddi, Radhika (Radhika) Jan. 16, 2014

Jan. 16, 2014

Hi, I would like to know whether you have removed Asia/Calcutta time zone from tz database? If so what is the solution for the existing customer who are using this timezone. Thanks & Regards, Radhika Peddi|Avaya India Pvt. Ltd.| Wing 'A', Level -5, Tower-11, Cybercity, Magarpatta City, Hadapsar | Pune, 411028|India Voice +91 20 4101 8311| Email: rpeddi<mailto:rpeddi@avaya.com>@avaya.com [ Please consider the environment before printing this email ]

3 2

Fiji to end DST one hour earlier
by Steffen Thorsen Jan. 10, 2014

Jan. 10, 2014

In a press release from the Fijian Government, they announce Fiji will end DST on 2014-01-19 02:00: http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-… > The Ministry of Labour, Industrial Relations and Employment is reminding > the public that daylight savings will end on the 19th of January, 2014. > Labour Minister, Jone Usamate said that the public will need to move their > clocks one hour backwards at 2am on the same day. Interesting enough they said 3 am in their previous announcement in August: http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-O… > Fiji will start daylight savings on Sunday 27th October, 2013 and end at > 3am on Sunday 19th January, 2014. Best regards, Steffen Thorsen - timeanddate.com

2 1

Timezones in Jordan
by Michael Gardiner Jan. 3, 2014

Jan. 3, 2014

Can you explain the current situation with regards to timezone data for Jordan. I work in the Australian Embassy in amman Jordan and am having a lot of issues with setting the correct time. On our computers when we use a NTP source such as: server 0.pool.ntp.org 120.88.46.10 server 1.pool.ntp.org server 2.pool.ntp.org server 3.pool.ntp.org It sets the clock 1 hour ahead of the correct time so I have to set them all manually which is not good. I have had a look at TZDATA2013i and it had the time as UTC +2 which should give us the correct time. Any Advise would be great. Regards Michael Gardiner First Secretary Technical Australian Embassy Amman Screen shot of using NTP server advances time by 1 hour: Having to Manually set the time (+4 minutes is writing the email): --

9 12

India gets its second time zone as Assam turns its clock ahead by an hour | NDTV.com
by Deborah Goldsmith Jan. 3, 2014

Jan. 3, 2014

http://www.ndtv.com/article/india/india-gets-its-second-time-zone-as-assam-… FYI. Deborah Goldsmith Apple, Inc.

3 2

India might get a second time zone
by Steffen Thorsen Jan. 2, 2014

Jan. 2, 2014

India might get a second time zone, the Government of Assam wants to move 1 hour ahead of the rest of India. So that will be a time zone of UTC+6:30 in that case. Date for the change is not yet announced, and it might need approval from central government, but from the news sources it sounds like it is quite likely to happen. Some sources: http://www.ndtv.com/article/india/india-gets-its-second-time-zone-as-assam-… http://www.livemint.com/Politics/Zd39EOMva038W5RJPFlXHM/Assam-moves-an-hour… Best regards, Steffen Thorsen - timeanddate.com

3 3

[PATCH] Initialize sp->defaulttype in tzparse()
by Logan Chien Jan. 2, 2014

Jan. 2, 2014

Hi, I found that sometimes the localtime() won't work properly, if sp->defaulttype is not set properly. For example, given the following code: time_t epoch = 0; setenv("TZ", "UTC+00", 1); tzset(); printf("%s", ctime(&epoch)); // (a) setenv("TZ", "Asia/Taipei", 1); tzset(); printf("%s", ctime(&epoch)); // (b) setenv("TZ", "UTC+00", 1); tzset(); printf("%s", ctime(&epoch)); // (c) The expected output should be: Thu Jan 1 00:00:00 1970 Thu Jan 1 08:00:00 1970 Thu Jan 1 00:00:00 1970 However, the output is: Thu Jan 1 00:00:00 1970 Thu Jan 1 08:00:00 1970 Thu Jan 1 08:00:00 1970 This is due to the fact that sp->defaulttype is set to 1 when we are using "Asia/Taipei" as the timezone, but it is not reset after we change the timezone to "UTC+00". As the result, the old value in sp->types[sp->defaulttype] is incorrectly used. The attached patch should resolve this issue. Please have a look. Thanks. Sincerely, Logan

2 1

Timezones in the new media
by Arthur David Olson Dec. 31, 2013

Dec. 31, 2013

Tom Scott, "The Problem with Time & Timezones - Computerphile" published 2013-12-30: http://www.youtube.com/watch?v=-5wpm-gesOY --ado

1 0

U.S. Pacific Time
by Hank W. Dec. 25, 2013

Dec. 25, 2013

I just noticed that in the note regarding Zone America/Los_Angeles in the northamerica data file, in addition to specifying that the northern three quarters of Idaho County, Idaho are included in the zone, it also lists Idaho County among the counties that are entirely included. # US Pacific time, represented by Los Angeles # # California, northern Idaho (Benewah, Bonner, Boundary, Clearwater, # Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, # and the northern three-quarters of Idaho county), # most of Nevada, most of Oregon, and Washington Hank W., Austin, Texas, USA

3 3