[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: localename and thread locale
From: |
Bruno Haible |
Subject: |
Re: localename and thread locale |
Date: |
Fri, 1 Jan 2010 10:37:20 +0100 |
User-agent: |
KMail/1.9.9 |
Hi,
I wrote on 2009-12-26:
> (gl_locale_name_thread_unsafe): New function, extracted from
> gl_locale_name_thread.
This leads to gcc warnings
localename.c:2602: warning: `gl_locale_name_thread_unsafe' defined but not
used
Fixed as follows:
2010-01-01 Bruno Haible <address@hidden>
localename: Avoid gcc warning.
* lib/localename.c (gl_locale_name_thread_unsafe): Don't define this
function if it is not used.
--- lib/localename.c.orig Fri Jan 1 10:32:13 2010
+++ lib/localename.c Fri Jan 1 10:31:54 2010
@@ -1,5 +1,5 @@
/* Determine name of the currently selected locale.
- Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2010 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -2592,20 +2592,22 @@
#endif
+#if defined IN_LIBINTL || HAVE_USELOCALE
+
/* Like gl_locale_name_thread, except that the result is not in storage of
indefinite extent. */
-#if !defined IN_LIBINTL
+# if !defined IN_LIBINTL
static
-#endif
+# endif
const char *
gl_locale_name_thread_unsafe (int category, const char *categoryname)
{
-#if HAVE_USELOCALE
+# if HAVE_USELOCALE
{
locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE)
{
-# if __GLIBC__ >= 2
+# if __GLIBC__ >= 2
/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
glibc < 2.12.
See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
@@ -2616,8 +2618,8 @@
nl_langinfo (_NL_LOCALE_NAME (category)). */
name = thread_locale->__names[category];
return name;
-# endif
-# if defined __APPLE__ && defined __MACH__ /* MacOS X */
+# endif
+# if defined __APPLE__ && defined __MACH__ /* MacOS X */
/* The locale name is found deep in an undocumented data structure.
Since it's stored in a buffer of size 32 and newlocale() rejects
locale names of length > 31, we can assume that it is NUL terminated
@@ -2715,13 +2717,15 @@
default: /* We shouldn't get here. */
return "";
}
-# endif
+# endif
}
}
-#endif
+# endif
return NULL;
}
+#endif
+
const char *
gl_locale_name_thread (int category, const char *categoryname)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: localename and thread locale,
Bruno Haible <=