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

Be more careful when using xlocale

Browse Source 
Bug 680074 shows that we may end up in situations where only
some of the xlocale functions we need are available. Rather than
trying to find the minimal set of required functions for each
use, define a global USE_XLOCALE and only use any xlocale functions
if we have a full set.
This commit is contained in:
Matthias Clasen 2012-07-19 06:32:29 -04:00
parent dd098405ad
commit 4c255d4602
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glib/gstrfuncs.c
View File

@ -317,7 +317,15 @@ static const guint16 ascii_table_data[256] = {
const guint16 * const g_ascii_table = ascii_table_data;
#ifdef HAVE_NEWLOCALE
#if defined (HAVE_NEWLOCALE) && \
defined (HAVE_USELOCALE) && \
defined (HAVE_STRTOD_L) && \
defined (HAVE_STRTOULL_L) && \
defined (HAVE_STRTOLL_L)
#define USE_XLOCALE 1
#endif
#ifdef USE_XLOCALE
static locale_t
get_C_locale (void)
{
@ -683,7 +691,7 @@ gdouble
g_ascii_strtod (const gchar *nptr,
gchar **endptr)
{
#ifdef HAVE_STRTOD_L
#ifdef USE_XLOCALE
g_return_val_if_fail (nptr != NULL, 0);
@ -890,7 +898,7 @@ g_ascii_formatd (gchar *buffer,
const gchar *format,
gdouble d)
{
#ifdef HAVE_USELOCALE
#ifdef USE_XLOCALE
locale_t old_locale;
old_locale = uselocale (get_C_locale ());
@ -975,7 +983,7 @@ g_ascii_formatd (gchar *buffer,
#define TOUPPER(c) (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
#define TOLOWER(c) (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
#if !defined(HAVE_STRTOLL_L) || !defined(HAVE_STRTOULL_L)
#ifndef USE_XLOCALE
static guint64
g_parse_long_long (const gchar *nptr,
@ -1100,7 +1108,7 @@ g_parse_long_long (const gchar *nptr,
}
return 0;
}
#endif
#endif /* !USE_XLOCALE */
/**
* g_ascii_strtoull:
@ -1136,7 +1144,7 @@ g_ascii_strtoull (const gchar *nptr,
gchar **endptr,
guint base)
{
#ifdef HAVE_STRTOULL_L
#ifdef USE_XLOCALE
return strtoull_l (nptr, endptr, base, get_C_locale ());
#else
gboolean negative;
@ -1183,7 +1191,7 @@ g_ascii_strtoll (const gchar *nptr,
gchar **endptr,
guint base)
{
#ifdef HAVE_STRTOLL_L
#ifdef USE_XLOCALE
return strtoll_l (nptr, endptr, base, get_C_locale ());
#else
gboolean negative;