From 0b2c4e4f5ad8fed6a0c60a2a573156caf9260b3a Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 9 Jan 2000 10:58:55 +0000 Subject: [PATCH] correctly fetch the current locale, fix from owen. Sun Jan 9 13:28:36 2000 Tim Janik * gstrfuncs.c (g_strtod): correctly fetch the current locale, fix from owen. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gstrfuncs.c | 4 +++- gstrfuncs.c | 4 +++- 10 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e43e739..ef72dca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e43e739..ef72dca 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e43e739..ef72dca 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index e43e739..ef72dca 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e43e739..ef72dca 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e43e739..ef72dca 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e43e739..ef72dca 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e43e739..ef72dca 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Jan 9 13:28:36 2000 Tim Janik + + * gstrfuncs.c (g_strtod): correctly fetch the current locale, + fix from owen. + 1999-12-16 Tor Lillqvist * gmodule/gmodule-win32.c: Use FormatMessage to translate system diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 99ce93a..e549260 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -200,9 +200,11 @@ g_strtod (const gchar *nptr, { gchar *old_locale; - old_locale = setlocale (LC_NUMERIC, "C"); + old_locale = g_strdup (setlocale (LC_NUMERIC, NULL)); + setlocale (LC_NUMERIC, "C"); val_2 = strtod (nptr, &fail_pos_2); setlocale (LC_NUMERIC, old_locale); + g_free (old_locale); } if (!fail_pos_1 || fail_pos_1[0] == 0 || fail_pos_1 >= fail_pos_2) diff --git a/gstrfuncs.c b/gstrfuncs.c index 99ce93a..e549260 100644 --- a/gstrfuncs.c +++ b/gstrfuncs.c @@ -200,9 +200,11 @@ g_strtod (const gchar *nptr, { gchar *old_locale; - old_locale = setlocale (LC_NUMERIC, "C"); + old_locale = g_strdup (setlocale (LC_NUMERIC, NULL)); + setlocale (LC_NUMERIC, "C"); val_2 = strtod (nptr, &fail_pos_2); setlocale (LC_NUMERIC, old_locale); + g_free (old_locale); } if (!fail_pos_1 || fail_pos_1[0] == 0 || fail_pos_1 >= fail_pos_2) -- 2.7.4