[BZ #40]

[platform/upstream/glibc.git] / iconv / gconv_charset.h

diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index 278bccc..31b545f 100644 (file)
--- a/iconv/gconv_charset.h
+++ b/iconv/gconv_charset.h
@@ -1,5 +1,5 @@
 /* Charset name normalization.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
 
@@ -19,17 +19,19 @@
    02111-1307 USA.  */
 
 #include <ctype.h>
+#include <locale.h>
 
 
-static inline void
+static void
 strip (char *wp, const char *s)
 {
   int slash_count = 0;
 
   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)
@@ -46,16 +48,11 @@ strip (char *wp, const char *s)
 }
 
 
-static char * __attribute__ ((unused))
+static inline char * __attribute__ ((unused, always_inline))
 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;
 }
-
-
-/* If NAME is an codeset alias expand it.  */
-extern int __gconv_compare_alias (const char *name1, const char *name2)
-     internal_function;