aboutsummaryrefslogtreecommitdiff
path: root/locale/newlocale.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-04 01:41:55 +0000
committerRoland McGrath <roland@gnu.org>2002-08-04 01:41:55 +0000
commit30c14c31ae6ac7c8db692fc23d0901e4d479f7af (patch)
tree25e403cd215f6d2ca484ae20a51ae41019ce19db /locale/newlocale.c
parent509d1b68421a9dc02605540615d241b48bf90a13 (diff)
downloadglibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.zip
glibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.tar.gz
glibc-30c14c31ae6ac7c8db692fc23d0901e4d479f7af.tar.bz2
* locale/setlocale.c (_nl_current_names): Variable moved ...
* locale/localename.c (_nl_current_names): ... here, new file. Make it global, with attribute_hidden. * locale/localeinfo.h: Declare it. * locale/Makefile (aux): Add localename. * locale/localename.c (__current_locale_name): New function. * include/locale.h (__current_locale_name): Declare it. * intl/dcigettext.c (guess_category_value): Use that instead of calling setlocale. * locale/locale.h [__USE_GNU] (locale_t): New type alias of __locale_t. [__USE_GNU] (newlocale, duplocale, freelocale, uselocale): New decls. [__USE_GNU] (LC_GLOBAL_LOCALE): New macro. * locale/newlocale.c: Add alias to __ name. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/uselocale.c: New file. * locale/Makefile (routines): Add it. * locale/Versions (libc: GLIBC_2.3): New set. Add newlocale, duplocale, freelocale, uselocale. (libc: GLIBC_PRIVATE): Add __uselocale. * locale/localeinfo.h [SHARED] (_NL_CURRENT_LOCALE): New macro, defined to fetch a tsd value. (_NL_CURRENT_DATA): Define using that. (_NL_CURRENT, _NL_CURRENT_WSTR, _NL_CURRENT_WORD): Define using that. (_NL_CURRENT_DEFINE): Define to empty. [! SHARED]: Decls of _nl_current_CATEGORY and _nl_current conditionalized on this. * locale/xlocale.c (NL_C_INTIIALIZER): New macro, taking initializer of _nl_C_locobj. [SHARED] (_nl_global_locale): New variable, using that initializer. (_nl_C_locobj): Use new macro for initialzier. * locale/setlocale.c [! SHARED] (_nl_current): Conditionalize on this. [! SHARED] (CATEGORY_USED): New macro. [SHARED] (CATEGORY_USED, _nl_C): New macros. (setdata, setlocale): Use that macro instead of examining _nl_current. (setdata): Set the slot in _nl_global_locale. Conditionalize setting of _nl_current on [! SHARED]. * locale/findlocale.c [SHARED] (_nl_C): Define as a macro instead of declaration as an extern. * locale/newlocale.c (__newlocale): Use _nl_C_locobj instead of _nl_C. * include/locale.h: Use libc_hidden_proto for setlocale. * locale/setlocale.c: Add libc_hidden_def. * locale/setlocale.c (free_mem): Use _NL_CURRENT_DATA.
Diffstat (limited to 'locale/newlocale.c')
-rw-r--r--locale/newlocale.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/locale/newlocale.c b/locale/newlocale.c
index 6306ba2..1442f86 100644
--- a/locale/newlocale.c
+++ b/locale/newlocale.c
@@ -26,9 +26,6 @@
#include "localeinfo.h"
-/* Constant data defined in setlocale.c. */
-extern struct locale_data *const _nl_C[] attribute_hidden;
-
/* Use this when we come along an error. */
#define ERROR_RETURN \
do { \
@@ -65,12 +62,8 @@ __newlocale (int category_mask, const char *locale, __locale_t base)
if (base != NULL)
result = *base;
else
- {
- /* Fill with pointers to C locale data. */
- for (cnt = 0; cnt < __LC_LAST; ++cnt)
- if (cnt != LC_ALL)
- result.__locales[cnt] = _nl_C[cnt];
- }
+ /* Fill with pointers to C locale data. */
+ result = _nl_C_locobj;
/* If no category is to be set we return BASE if available or a
dataset using the C locale data. */
@@ -184,3 +177,4 @@ __newlocale (int category_mask, const char *locale, __locale_t base)
return result_ptr;
}
+weak_alias (__newlocale, newlocale)