luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract function init_zone_from_iana_info

Browse Source
This commit is contained in:
John Ralls 2012-10-15 14:19:53 -07:00
parent 47de8646e2
commit 489e031f22
1 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
glib/gtimezone.c
View File

@ -348,6 +348,51 @@ zone_info_unix (const gchar *identifier)
return zoneinfo; return zoneinfo;
} }
static void
init_zone_from_iana_info (GTimeZone *tz)
{
gsize size;
const struct tzhead *header = g_bytes_get_data (tz->zoneinfo, &size);
if (size < sizeof (struct tzhead) || memcmp (header, "TZif", 4))
{
g_bytes_unref (tz->zoneinfo);
tz->zoneinfo = NULL;
}
else
{
gint typecnt;
tz->version = header->tzh_version;
/* we trust the file completely. */
if (tz->version == '2')
tz->header = (const struct tzhead *)
(((const gchar *) (header + 1)) +
guint32_from_be(header->tzh_ttisgmtcnt) +
guint32_from_be(header->tzh_ttisstdcnt) +
8 * guint32_from_be(header->tzh_leapcnt) +
5 * guint32_from_be(header->tzh_timecnt) +
6 * guint32_from_be(header->tzh_typecnt) +
guint32_from_be(header->tzh_charcnt));
else
tz->header = header;
typecnt = guint32_from_be (tz->header->tzh_typecnt);
tz->timecnt = guint32_from_be (tz->header->tzh_timecnt);
if (tz->version == '2')
{
tz->trans.two = (gconstpointer) (tz->header + 1);
tz->indices = (gconstpointer) (tz->trans.two + tz->timecnt);
}
else
{
tz->trans.one = (gconstpointer) (tz->header + 1);
tz->indices = (gconstpointer) (tz->trans.one + tz->timecnt);
}
tz->infos = (gconstpointer) (tz->indices + tz->timecnt);
tz->abbrs = (gconstpointer) (tz->infos + typecnt);
}
}
/* Construction {{{1 */ /* Construction {{{1 */
/** /**
@ -418,49 +463,7 @@ g_time_zone_new (const gchar *identifier)
tz->zoneinfo = zone_info_unix (identifier); tz->zoneinfo = zone_info_unix (identifier);
if (tz->zoneinfo != NULL) if (tz->zoneinfo != NULL)
{ init_zone_from_iana_info (tz);
gsize size;
const struct tzhead *header = g_bytes_get_data (tz->zoneinfo, &size);
if (size < sizeof (struct tzhead) || memcmp (header, "TZif", 4))
{
g_bytes_unref (tz->zoneinfo);
tz->zoneinfo = NULL;
}
else
{
gint typecnt;
tz->version = header->tzh_version;
/* we trust the file completely. */
if (tz->version == '2')
tz->header = (const struct tzhead *)
(((const gchar *) (header + 1)) +
guint32_from_be(header->tzh_ttisgmtcnt) +
guint32_from_be(header->tzh_ttisstdcnt) +
8 * guint32_from_be(header->tzh_leapcnt) +
5 * guint32_from_be(header->tzh_timecnt) +
6 * guint32_from_be(header->tzh_typecnt) +
guint32_from_be(header->tzh_charcnt));
else
tz->header = header;
typecnt = guint32_from_be (tz->header->tzh_typecnt);
tz->timecnt = guint32_from_be (tz->header->tzh_timecnt);
if (tz->version == '2')
{
tz->trans.two = (gconstpointer) (tz->header + 1);
tz->indices = (gconstpointer) (tz->trans.two + tz->timecnt);
}
else
{
tz->trans.one = (gconstpointer) (tz->header + 1);
tz->indices = (gconstpointer) (tz->trans.one + tz->timecnt);
}
tz->infos = (gconstpointer) (tz->indices + tz->timecnt);
tz->abbrs = (gconstpointer) (tz->infos + typecnt);
}
}
if (identifier) if (identifier)
g_hash_table_insert (time_zones, tz->name, tz); g_hash_table_insert (time_zones, tz->name, tz);
} }