Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / iconv / gconv_charset.h

diff --git a/iconv/gconv_charset.h b/iconv/gconv_charset.h
index 1e2b76bdca581cf5c4ac0cfd21c4ba4b6c36e28b..6fbfc34bd85c6922034c0892cf83123993276793 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-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
 
@@ -14,22 +14,23 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #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_ptr)
+         || *s == '_' || *s == '-' || *s == '.' || *s == ',' || *s == ':')
+       *wp++ = __toupper_l (*s, _nl_C_locobj_ptr);
       else if (*s == '/')
        {
          if (++slash_count == 3)
@@ -46,15 +47,11 @@ strip (char *wp, const char *s)
 }
 
 
-static char *
+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_ptr)) != '\0')
     /* nothing */;
   return dst;
 }
-
-
-/* If NAME is an codeset alias expand it.  */
-extern const char *__gconv_lookup_alias (const char *name);