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

Correct FIXME by implementing a function for converting two digits year

Browse Source 
Signed-off-by: Frederic Martinsons <frederic.martinsons@sigfox.com>
This commit is contained in:
Frederic Martinsons 2020-11-29 08:01:39 +01:00
parent 6d50032167
commit b4f2002919
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
glib/gdate.c
View File

@ -1206,6 +1206,22 @@ g_date_prepare_to_parse (const gchar *str,
g_date_fill_parse_tokens (str, pt); g_date_fill_parse_tokens (str, pt);
} }
static guint
convert_twodigit_year (gint y)
{
if (using_twodigit_years && y < 100)
{
guint two = twodigit_start_year % 100;
guint century = (twodigit_start_year / 100) * 100;
if (y < two)
century += 100;
y += century;
}
return y;
}
/** /**
* g_date_set_parse: * g_date_set_parse:
* @date: a #GDate to fill in * @date: a #GDate to fill in
@ -1302,16 +1318,8 @@ g_date_set_parse (GDate *d,
{ {
y += locale_era_adjust; y += locale_era_adjust;
} }
else if (using_twodigit_years && y < 100)
{
guint two = twodigit_start_year % 100;
guint century = (twodigit_start_year / 100) * 100;
if (y < two) y = convert_twodigit_year (y);
century += 100;
y += century;
}
} }
break; break;
default: default:
@ -1356,17 +1364,7 @@ g_date_set_parse (GDate *d,
day = pt.n[0] % 100; day = pt.n[0] % 100;
y = pt.n[0]/10000; y = pt.n[0]/10000;
/* FIXME move this into a separate function */ y = convert_twodigit_year (y);
if (using_twodigit_years && y < 100)
{
guint two = twodigit_start_year % 100;
guint century = (twodigit_start_year / 100) * 100;
if (y < two)
century += 100;
y += century;
}
} }
} }