X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ficonv_open.c;h=ab9b6b4ec3d71385f3e32a53a900e606687ab5dd;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=664b705ec6a2f3247d02c61a5748241e989d25c8;hpb=6555032ce1d744fe2f04f0299f89cf0995581d2a;p=gnulib.git

diff --git a/lib/iconv_open.c b/lib/iconv_open.c
index 664b705ec..ab9b6b4ec 100644
--- a/lib/iconv_open.c
+++ b/lib/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -57,7 +56,7 @@ rpl_iconv_open (const char *tocode, const char *fromcode)
      iconv() to these encoding inserts a BOM, which is wrong.
      We do not need to handle conversion between arbitrary encodings and
      UTF-{16,32}{BE,LE}, because the 'striconveh' module implements two-step
-     conversion throough UTF-8.
+     conversion through UTF-8.
      The _ICONV_* constants are chosen to be disjoint from any iconv_t
      returned by the system's iconv_open() functions.  Recall that iconv_t
      is a scalar type.  */
@@ -67,33 +66,33 @@ rpl_iconv_open (const char *tocode, const char *fromcode)
       && fromcode[3] == '-')
     {
       if (c_toupper (tocode[0]) == 'U'
-	  && c_toupper (tocode[1]) == 'T'
-	  && c_toupper (tocode[2]) == 'F'
-	  && tocode[3] == '-')
-	{
-	  if (strcmp (fromcode + 4, "8") == 0)
-	    {
-	      if (c_strcasecmp (tocode + 4, "16BE") == 0)
-		return _ICONV_UTF8_UTF16BE;
-	      if (c_strcasecmp (tocode + 4, "16LE") == 0)
-		return _ICONV_UTF8_UTF16LE;
-	      if (c_strcasecmp (tocode + 4, "32BE") == 0)
-		return _ICONV_UTF8_UTF32BE;
-	      if (c_strcasecmp (tocode + 4, "32LE") == 0)
-		return _ICONV_UTF8_UTF32LE;
-	    }
-	  else if (strcmp (tocode + 4, "8") == 0)
-	    {
-	      if (c_strcasecmp (fromcode + 4, "16BE") == 0)
-		return _ICONV_UTF16BE_UTF8;
-	      if (c_strcasecmp (fromcode + 4, "16LE") == 0)
-		return _ICONV_UTF16LE_UTF8;
-	      if (c_strcasecmp (fromcode + 4, "32BE") == 0)
-		return _ICONV_UTF32BE_UTF8;
-	      if (c_strcasecmp (fromcode + 4, "32LE") == 0)
-		return _ICONV_UTF32LE_UTF8;
-	    }
-	}
+          && c_toupper (tocode[1]) == 'T'
+          && c_toupper (tocode[2]) == 'F'
+          && tocode[3] == '-')
+        {
+          if (strcmp (fromcode + 4, "8") == 0)
+            {
+              if (c_strcasecmp (tocode + 4, "16BE") == 0)
+                return _ICONV_UTF8_UTF16BE;
+              if (c_strcasecmp (tocode + 4, "16LE") == 0)
+                return _ICONV_UTF8_UTF16LE;
+              if (c_strcasecmp (tocode + 4, "32BE") == 0)
+                return _ICONV_UTF8_UTF32BE;
+              if (c_strcasecmp (tocode + 4, "32LE") == 0)
+                return _ICONV_UTF8_UTF32LE;
+            }
+          else if (strcmp (tocode + 4, "8") == 0)
+            {
+              if (c_strcasecmp (fromcode + 4, "16BE") == 0)
+                return _ICONV_UTF16BE_UTF8;
+              if (c_strcasecmp (fromcode + 4, "16LE") == 0)
+                return _ICONV_UTF16LE_UTF8;
+              if (c_strcasecmp (fromcode + 4, "32BE") == 0)
+                return _ICONV_UTF32BE_UTF8;
+              if (c_strcasecmp (fromcode + 4, "32LE") == 0)
+                return _ICONV_UTF32LE_UTF8;
+            }
+        }
     }
 #endif
 
@@ -116,20 +115,20 @@ rpl_iconv_open (const char *tocode, const char *fromcode)
 
   /* Convert the encodings to upper case, because
        1. in the arguments of iconv_open() on AIX, HP-UX, and OSF/1 the case
-	  matters,
+          matters,
        2. it makes searching in the table faster.  */
   {
     const char *p = fromcode;
     char *q = fromcode_upper;
     while ((*q = c_toupper (*p)) != '\0')
       {
-	p++;
-	q++;
-	if (q == &fromcode_upper[SIZEOF (fromcode_upper)])
-	  {
-	    errno = EINVAL;
-	    return (iconv_t)(-1);
-	  }
+        p++;
+        q++;
+        if (q == &fromcode_upper[SIZEOF (fromcode_upper)])
+          {
+            errno = EINVAL;
+            return (iconv_t)(-1);
+          }
       }
     fromcode_upper_end = q;
   }
@@ -139,13 +138,13 @@ rpl_iconv_open (const char *tocode, const char *fromcode)
     char *q = tocode_upper;
     while ((*q = c_toupper (*p)) != '\0')
       {
-	p++;
-	q++;
-	if (q == &tocode_upper[SIZEOF (tocode_upper)])
-	  {
-	    errno = EINVAL;
-	    return (iconv_t)(-1);
-	  }
+        p++;
+        q++;
+        if (q == &tocode_upper[SIZEOF (tocode_upper)])
+          {
+            errno = EINVAL;
+            return (iconv_t)(-1);
+          }
       }
     tocode_upper_end = q;
   }