X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu16-to-u8.c;h=02eee970c1a55ef1aba4102cd8a53de7960076d6;hb=ddf6704b29173e809f3b0150c015ca282e06388f;hp=484af1ac3fcd9420b0fd23dd13c9d217ff33c2be;hpb=00da503f0eb41eae7b4bcfd2c539faf50d946695;p=gnulib.git

diff --git a/lib/unistr/u16-to-u8.c b/lib/unistr/u16-to-u8.c
index 484af1ac3..02eee970c 100644
--- a/lib/unistr/u16-to-u8.c
+++ b/lib/unistr/u16-to-u8.c
@@ -1,21 +1,19 @@
 /* Convert UTF-16 string to UTF-8 string.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -60,68 +58,68 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp)
       int count;
 
       /* Fetch a Unicode character from the input string.  */
-      count = u16_mbtouc_safe (&uc, s, s_end - s);
+      count = u16_mbtoucr (&uc, s, s_end - s);
       if (count < 0)
-	{
-	  if (!(result == resultbuf || result == NULL))
-	    free (result);
-	  errno = EILSEQ;
-	  return NULL;
-	}
+        {
+          if (!(result == resultbuf || result == NULL))
+            free (result);
+          errno = EILSEQ;
+          return NULL;
+        }
       s += count;
 
       /* Store it in the output string.  */
       count = u8_uctomb (result + length, uc, allocated - length);
       if (count == -1)
-	{
-	  if (!(result == resultbuf || result == NULL))
-	    free (result);
-	  errno = EILSEQ;
-	  return NULL;
-	}
+        {
+          if (!(result == resultbuf || result == NULL))
+            free (result);
+          errno = EILSEQ;
+          return NULL;
+        }
       if (count == -2)
-	{
-	  DST_UNIT *memory;
-
-	  allocated = (allocated > 0 ? 2 * allocated : 12);
-	  if (length + 6 > allocated)
-	    allocated = length + 6;
-	  if (result == resultbuf || result == NULL)
-	    memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
-	  else
-	    memory =
-	      (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
-
-	  if (memory == NULL)
-	    {
-	      if (!(result == resultbuf || result == NULL))
-		free (result);
-	      errno = ENOMEM;
-	      return NULL;
-	    }
-	  if (result == resultbuf && length > 0)
-	    memcpy ((char *) memory, (char *) result,
-		    length * sizeof (DST_UNIT));
-	  result = memory;
-	  count = u8_uctomb (result + length, uc, allocated - length);
-	  if (count < 0)
-	    abort ();
-	}
+        {
+          DST_UNIT *memory;
+
+          allocated = (allocated > 0 ? 2 * allocated : 12);
+          if (length + 6 > allocated)
+            allocated = length + 6;
+          if (result == resultbuf || result == NULL)
+            memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+          else
+            memory =
+              (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+
+          if (memory == NULL)
+            {
+              if (!(result == resultbuf || result == NULL))
+                free (result);
+              errno = ENOMEM;
+              return NULL;
+            }
+          if (result == resultbuf && length > 0)
+            memcpy ((char *) memory, (char *) result,
+                    length * sizeof (DST_UNIT));
+          result = memory;
+          count = u8_uctomb (result + length, uc, allocated - length);
+          if (count < 0)
+            abort ();
+        }
       length += count;
     }
 
   if (length == 0)
     {
       if (result == NULL)
-	{
-	  /* Return a non-NULL value.  NULL means error.  */
-	  result = (DST_UNIT *) malloc (1);
-	  if (result == NULL)
-	    {
-	      errno = ENOMEM;
-	      return NULL;
-	    }
-	}
+        {
+          /* Return a non-NULL value.  NULL means error.  */
+          result = (DST_UNIT *) malloc (1);
+          if (result == NULL)
+            {
+              errno = ENOMEM;
+              return NULL;
+            }
+        }
     }
   else if (result != resultbuf && length < allocated)
     {
@@ -130,7 +128,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp)
 
       memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
       if (memory != NULL)
-	result = memory;
+        result = memory;
     }
 
   *lengthp = length;