From 426bf3a396d0f7743decebe861b503398400233e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 31 Aug 2002 18:29:52 +0000 Subject: * locale/duplocale.c (__duplocale): Free names from the right array. * locale/uselocale.c (__uselocale): Return previous locale when setting a new one. * locale/newlocale.c: Commit changes from 2002-08-30 batch where I failed to commit this file: (__newlocale): Fill in __names array. --- locale/uselocale.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'locale/uselocale.c') diff --git a/locale/uselocale.c b/locale/uselocale.c index d5e53113c1..d19ae50d0b 100644 --- a/locale/uselocale.c +++ b/locale/uselocale.c @@ -28,12 +28,9 @@ locale_t __uselocale (locale_t newloc) { - if (newloc == NULL) - { - locale_t loc = __libc_tsd_get (LOCALE); - return loc == &_nl_global_locale ? LC_GLOBAL_LOCALE : loc; - } - else + locale_t oldloc = __libc_tsd_get (LOCALE); + + if (newloc != NULL) { const locale_t locobj = newloc == LC_GLOBAL_LOCALE ? &_nl_global_locale : newloc; @@ -65,6 +62,6 @@ __uselocale (locale_t newloc) #endif } - return newloc; + return oldloc == &_nl_global_locale ? LC_GLOBAL_LOCALE : oldloc; } weak_alias (__uselocale, uselocale) -- cgit 1.4.1