aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-14 23:29:55 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-14 23:29:55 +0000
commit5db915715f800d0858346bfbb5eea6aff4287ebd (patch)
tree3e80f9b69ab93f869da0c78cc63eb4ebf5149230 /iconv/gconv_charset.h
parentUpdate. (diff)
downloadglibc-5db915715f800d0858346bfbb5eea6aff4287ebd.tar.gz
glibc-5db915715f800d0858346bfbb5eea6aff4287ebd.tar.bz2
glibc-5db915715f800d0858346bfbb5eea6aff4287ebd.zip
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 'iconv/gconv_charset.h')
-rw-r--r--iconv/gconv_charset.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index 278bccc8d5..76a92a15ab 100644
--- a/iconv/gconv_charset.h
+++ b/iconv/gconv_charset.h
@@ -19,6 +19,7 @@
02111-1307 USA. */
#include <ctype.h>
+#include <locale.h>
static inline void
@@ -28,8 +29,9 @@ strip (char *wp, const char *s)
while (*s != '\0')
{
- if (isalnum (*s) || *s == '_' || *s == '-' || *s == '.')
- *wp++ = toupper (*s);
+ if (__isalnum_l (*s, &_nl_C_locobj)
+ || *s == '_' || *s == '-' || *s == '.')
+ *wp++ = __toupper_l (*s, &_nl_C_locobj);
else if (*s == '/')
{
if (++slash_count == 3)
@@ -50,7 +52,7 @@ static char * __attribute__ ((unused))
upstr (char *dst, const char *str)
{
char *cp = dst;
- while ((*cp++ = toupper (*str++)) != '\0')
+ while ((*cp++ = __toupper_l (*str++, &_nl_C_locobj)) != '\0')
/* nothing */;
return dst;
}