X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu8-to-u16.c;h=00426e6a4464e4dca92706c99c47a9ad31208099;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=03c6600095791db1a1f181802c01469bfaf543e0;hpb=ac5cf7982cea8a4bb17680b6b9925f301cfa4220;p=gnulib.git

diff --git a/lib/unistr/u8-to-u16.c b/lib/unistr/u8-to-u16.c
index 03c660009..00426e6a4 100644
--- a/lib/unistr/u8-to-u16.c
+++ b/lib/unistr/u8-to-u16.c
@@ -1,5 +1,5 @@
 /* Convert UTF-8 string to UTF-16 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
@@ -58,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 = u8_mbtouc (&uc, s, s_end - s);
+      count = u8_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 = u16_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 + 2 > allocated)
-	    allocated = length + 2;
-	  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 = u16_uctomb (result + length, uc, allocated - length);
-	  if (count < 0)
-	    abort ();
-	}
+        {
+          DST_UNIT *memory;
+
+          allocated = (allocated > 0 ? 2 * allocated : 12);
+          if (length + 2 > allocated)
+            allocated = length + 2;
+          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 = u16_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)
     {
@@ -128,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;