Refactor EnsureUTF8 and IsUTF8

src/text/unicode.c

@@ -2,7 +2,7 @@
  * unicode.c: Unicode <-> locale functions
  *****************************************************************************
  * Copyright (C) 2005-2006 the VideoLAN team
- * Copyright © 2005-2008 Rémi Denis-Courmont
+ * Copyright © 2005-2010 Rémi Denis-Courmont
  *
  * Authors: Rémi Denis-Courmont <rem # videolan.org>
  *
@@ -273,30 +273,39 @@ int utf8_fprintf( FILE *stream, const char *fmt, ... )
 }
 
 
-static char *CheckUTF8( char *str, char rep )
+/**
+ * Converts the first character from a UTF-8 sequence into a code point.
+ *
+ * @param str an UTF-8 bytes sequence
+ * @return 0 if str points to an empty string, i.e. the first character is NUL;
+ * number of bytes that the first character occupies (from 1 to 4) otherwise;
+ * -1 if the byte sequence was not a valid UTF-8 sequence.
+ */
+static size_t vlc_towc (const char *str, uint32_t *restrict pwc)
 {
     uint8_t *ptr = (uint8_t *)str;
     assert (str != NULL);
 
-    for (;;)
-    {
     uint8_t c = ptr[0];
 
-        if (c == '\0')
-            break;
+    if (unlikely(c == '\0'))
+    {
+        *pwc = 0;
+        return 0;
+    }
 
-        if (c > 0xF4)
-            goto error;
+    if (unlikely(c > 0xF4))
+        return -1;
 
     int charlen = clz8 (c ^ 0xFF);
     switch (charlen)
     {
         case 0: // 7-bit ASCII character -> OK
-                ptr++;
-                continue;
+            *pwc = c;
+            return 1;
 
         case 1: // continuation byte -> error
-                goto error;
+            return -1;
     }
 
     assert (charlen >= 2 && charlen <= 4);
@@ -307,8 +316,8 @@ static char *CheckUTF8( char *str, char rep )
         assert (cp < (1 << 26));
         c = ptr[i];
 
-            if ((c >> 6) != 2) // not a continuation byte
-                goto error;
+        if (unlikely((c >> 6) != 2)) // not a continuation byte
+            return -1;
 
         cp = (cp << 6) | (ptr[i] & 0x3f);
     }
@@ -316,30 +325,22 @@ static char *CheckUTF8( char *str, char rep )
     switch (charlen)
     {
         case 4:
-                if (cp > 0x10FFFF) // beyond Unicode
-                    goto error;
+            if (unlikely(cp > 0x10FFFF)) // beyond Unicode
+                return -1;
         case 3:
-                if (cp >= 0xD800 && cp < 0xC000) // UTF-16 surrogate
-                    goto error;
+            if (unlikely(cp >= 0xD800 && cp < 0xC000)) // UTF-16 surrogate
+                return -1;
         case 2:
-                if (cp < 128) // ASCII overlong
-                    goto error;
-                if (cp < (1u << (5 * charlen - 3))) // overlong
-                    goto error;
-        }
-        ptr += charlen;
-        continue;
-
-    error:
-        if (rep == 0)
-            return NULL;
-        *ptr++ = rep;
-        str = NULL;
+            if (unlikely(cp < 128)) // ASCII overlong
+                return -1;
+            if (unlikely(cp < (1u << (5 * charlen - 3)))) // overlong
+                return -1;
     }
-
-    return str;
+    *pwc = cp;
+    return charlen;
 }
 
+
 /**
  * Replaces invalid/overlong UTF-8 sequences with question marks.
  * Note that it is not possible to convert from Latin-1 to UTF-8 on the fly,
@@ -349,7 +350,19 @@ static char *CheckUTF8( char *str, char rep )
  */
 char *EnsureUTF8( char *str )
 {
-    return CheckUTF8( str, '?' );
+    char *ret = str;
+    size_t n;
+    uint32_t cp;
+
+    while ((n = vlc_towc (str, &cp)) != 0)
+        if (likely(n != (size_t)-1))
+            str += n;
+        else
+        {
+            *str++ = '?';
+            ret = NULL;
+        }
+    return ret;
 }
 
 
@@ -362,7 +375,15 @@ char *EnsureUTF8( char *str )
  */
 const char *IsUTF8( const char *str )
 {
-    return CheckUTF8( (char *)str, 0 );
+    size_t n;
+    uint32_t cp;
+
+    while ((n = vlc_towc (str, &cp)) != 0)
+        if (likely(n != (size_t)-1))
+            str += n;
+        else
+            return NULL;
+    return str;
 }
 
 /**