luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

GTimeZone interval_info: Fix interval 0 per IANA tzfile instructions

Browse Source 
IANA tzfiles don't always put standard time in the 0th t_info. Follow
their instructions to use the first standard time t_info for interval 0.
This commit is contained in:
John Ralls 2012-12-18 15:41:09 -08:00
parent 0f0404af21
commit c9939b0fc7
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glib/gtimezone.c
View File

@ -1186,7 +1186,7 @@ parse_identifier_boundary (gchar **pos, TimeZoneDate *target)
return ret; return ret;
} }
static boolean static gboolean
set_tz_name (gchar **pos, gchar *buffer, guint size) set_tz_name (gchar **pos, gchar *buffer, guint size)
{ {
gchar *name_pos = *pos; gchar *name_pos = *pos;
@ -1505,8 +1505,13 @@ g_time_zone_new_local (void)
#define TRANSITION_INFO(n) g_array_index (tz->t_info, TransitionInfo, n) #define TRANSITION_INFO(n) g_array_index (tz->t_info, TransitionInfo, n)
/* Internal helpers {{{1 */ /* Internal helpers {{{1 */
/* Note that interval 0 is *before* the first transition time, so /* NB: Interval 0 is before the first transition, so there's no
* interval 1 gets transitions[0]. * transition structure to point to which TransitionInfo to
* use. Rule-based zones are set up so that TI 0 is always standard
* time (which is what's in effect before Daylight time got started
* in the early 20th century), but IANA tzfiles don't follow that
* convention. The tzfile documentation says to use the first
* standard-time (i.e., non-DST) tinfo, so that's what we do.
*/ */
inline static const TransitionInfo* inline static const TransitionInfo*
interval_info (GTimeZone *tz, interval_info (GTimeZone *tz,
@ -1517,7 +1522,16 @@ interval_info (GTimeZone *tz,
if (interval && tz->transitions && interval <= tz->transitions->len) if (interval && tz->transitions && interval <= tz->transitions->len)
index = (TRANSITION(interval - 1)).info_index; index = (TRANSITION(interval - 1)).info_index;
else else
index = 0; {
for (index = 0; index < tz->t_info->len; index++)
{
TransitionInfo *tzinfo = &(TRANSITION_INFO(index));
if (!tzinfo->is_dst)
return tzinfo;
}
index = 0;
}
return &(TRANSITION_INFO(index)); return &(TRANSITION_INFO(index));
} }