diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-14 23:29:55 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-14 23:29:55 +0000 |
| commit | 5db915715f800d0858346bfbb5eea6aff4287ebd (patch) | |
| tree | 3e80f9b69ab93f869da0c78cc63eb4ebf5149230 /locale/newlocale.c | |
| parent | ecad39f050c89d63673101ae0d6b54fb2dfbed1b (diff) | |
Update.
2001-08-14 Jakub Jelinek <jakub@redhat.com>
* resolv/nss_dns/dns-host.c (RESOLVSORT): Define.
(addrsort): New function.
* resolv/gethnamaddr.c (RESOLVSORT): Define.
2001-08-14 Jakub Jelinek <jakub@redhat.com>
* string/strsignal.c (free_mem): Remove.
2001-08-14 Andreas Jaeger <aj@suse.de>
* inet/inet_ntoa.c (free_mem): Remove, it's not used anymore.
Closes PR libc/2477, reported by Dylan Alex Simon
<dylan@dylex.caltech.edu>.
2001-08-14 Ulrich Drepper <drepper@redhat.com>
* locale/Makefile (aux): Add xlocale.
* locale/xlocale.c: New file.
* include/locale.c (_nl_C_locobj): Declare.
* iconv/gconv_charset.h: Use __tolower_l, __isdigit_l, __isspace_l
with _nl_C_locobj instead of tolower, isdigit, isspace.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* locale/newlocale.c: Minor cleanups.
Diffstat (limited to 'locale/newlocale.c')
| -rw-r--r-- | locale/newlocale.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/locale/newlocale.c b/locale/newlocale.c index 19e65e29f2..4a785d0c0f 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -163,10 +163,12 @@ __newlocale (int category_mask, const char *locale, __locale_t base) if (result_ptr == NULL) return NULL; - *result_ptr = result; } else - *(result_ptr = base) = result; + /* We modify the base structure. */ + result_ptr = base; + + *result_ptr = result; /* Update the special members. */ update: |