luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-06 16:08:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

g_time_val_from_iso8601: handle timezoneless dates

Browse Source 
per ISO 8601:2004 4.2.5.2

Based on a patch from Andy Shevchenko
http://bugzilla.gnome.org/show_bug.cgi?id=589491
This commit is contained in:
Dan Winship
2009-09-01 09:37:48 -04:00
parent fc44bf40a4
commit 8212aadac7
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
glib/gtimer.c
View File

@@ -364,7 +364,6 @@ g_time_val_from_iso8601 (const gchar *iso_date,
tm.tm_hour = val / 10000;
}
time_->tv_sec = mktime_utc (&tm);
time_->tv_usec = 0;
if (*iso_date == ',' || *iso_date == '.')
@@ -378,7 +377,13 @@ g_time_val_from_iso8601 (const gchar *iso_date,
}
}
if (*iso_date == '+' || *iso_date == '-')
/* Now parse the offset and convert tm to a time_t */
if (*iso_date == 'Z')
{
iso_date++;
time_->tv_sec = mktime_utc (&tm);
}
else if (*iso_date == '+' || *iso_date == '-')
{
gint sign = (*iso_date == '+') ? -1 : 1;
@@ -389,10 +394,13 @@ g_time_val_from_iso8601 (const gchar *iso_date,
else
val = 60 * (val / 100) + (val % 100);
time_->tv_sec += (time_t) (60 * val * sign);
time_->tv_sec = mktime_utc (&tm) + (time_t) (60 * val * sign);
}
else
{
/* No "Z" or offset, so local time */
time_->tv_sec = mktime (&tm);
}
else if (*iso_date++ != 'Z')
return FALSE;
while (g_ascii_isspace (*iso_date))
iso_date++;