From 1ce8aaaedbf549702c607e8a944bcb06b2c37544 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 30 Aug 2002 10:36:44 +0000 Subject: * locale/xlocale.h (struct __locale_struct): New member `__names'. * locale/xlocale.c (_nl_C_locobj): Update initializer. * locale/global-locale.c (_nl_global_locale): Likewise. * locale/duplocale.c (__duplocale): strdup __names elements. * locale/freelocale.c (__freelocale): Free __names elements. * locale/localename.c (_nl_current_names): Variable removed. (__current_locale_name): Use _NL_CURRENT_LOCALE->__names instead. * locale/localeinfo.h (_nl_current_names): Removed decl. * locale/setlocale.c: Use _nl_global_locale->__names in place of _nl_current_names throughout. * locale/setlocale.c (setlocale): strdup -> __strdup (not ISO C). * sysdeps/gnu/errlist-compat.awk: Emit link_warnings for sys_errlist and sys_nerr in the output file. * sunrpc/Makefile (rpcgen-cmd): Pass CPP in rpcgen's environment. * scripts/cpp: Just use the environment variable. * libio/tst-mmap-setvbuf.c (main): Use 'm' fopen flag. * libio/tst-mmap-offend.c (do_test): Likewise. * libio/tst-mmap-fflushsync.c (do_test): Likewise. * libio/tst-mmap-eofsync.c (do_test): Likewise. * libio/tst-mmap2-eofsync.c (do_test): Likewise. --- locale/localename.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'locale/localename.c') diff --git a/locale/localename.c b/locale/localename.c index 377ec296a6..845cfb0e71 100644 --- a/locale/localename.c +++ b/locale/localename.c @@ -19,22 +19,9 @@ #include "localeinfo.h" -/* Name of current locale for each individual category. - Each is malloc'd unless it is _nl_C_name. */ -const char *_nl_current_names[] attribute_hidden = - { -#define DEFINE_CATEGORY(category, category_name, items, a) \ - [category] = _nl_C_name, -#include "categories.def" -#undef DEFINE_CATEGORY - [LC_ALL] = _nl_C_name /* For LC_ALL. */ - }; - const char * attribute_hidden __current_locale_name (int category) { - return (_NL_CURRENT_LOCALE == &_nl_global_locale - ? _nl_current_names[category] - : _NL_CURRENT_LOCALE->__locales[category]->name); + return _NL_CURRENT_LOCALE->__names[category]; } -- cgit v1.2.1