Changeset 31418 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 5, 2010 5:37:13 PM (14 years ago)

Author:

vboxsync

Message:

iprt/string.h,utf-8.cpp: avoid including uni.h; misc nits.

File:

• trunk/src/VBox/Runtime/common/string/utf-8.cpp (modified) (13 diffs)

trunk/src/VBox/Runtime/common/string/utf-8.cpp

@@ -64 +64 @@
         {
             /* figure sequence length and validate the first byte */
+/** @todo RT_USE_RTC_3629 */
             unsigned cb;
             if ((uch & (RT_BIT(7) | RT_BIT(6) | RT_BIT(5))) == (RT_BIT(7) | RT_BIT(6)))
@@ -805 +806 @@
 {
     size_t  cch = 0;
-    while (true)
+    for (;;)
     {
         RTUNICP Cp;
@@ -814 +815 @@
         if (RT_FAILURE(rc))
             return rc;
-        cchCp = RTStrCpSize(Cp);
-        if (cchCp == 0)
-            return VERR_NO_TRANSLATION;
-        cch += cchCp;
+        cch += RTStrCpSize(Cp); /* cannot fail */
     }
 
@@ -838 +836 @@
 static int rtLatin1RecodeAsUtf8(const char *pszIn, size_t cchIn, char *psz, size_t cch)
 {
-    int   rc  = VINF_SUCCESS;
-
-    while (true)
+    int     rc = VINF_SUCCESS;
+    for (;;)
     {
         RTUNICP Cp;
@@ -854 +851 @@
             break;
         }
+        cch -= cchCp;
         psz = RTStrPutCp(psz, Cp);
-        cch -= cchCp;
     }
 
@@ -985 +982 @@
 
 /**
- * Calculates the Latin-1 length of a string, validating the encoding while doing so.
+ * Calculates the Latin-1 length of a string, validating the encoding while
+ * doing so.
  *
  * @returns IPRT status code.
@@ -996 +994 @@
 {
     size_t  cch = 0;
-    while (true)
+    for (;;)
     {
         RTUNICP Cp;
@@ -1033 +1031 @@
     int   rc  = VINF_SUCCESS;
 
-    while (true)
+    for (;;)
     {
         RTUNICP Cp;
@@ -1047 +1045 @@
             break;
         }
+        cch -= cchCp;
         psz = RTLatin1PutCp(psz, Cp);
-        cch -= cchCp;
     }
 
@@ -1224 +1222 @@
     {
         /* figure the length and validate the first octet. */
+/** @todo RT_USE_RTC_3629 */
         unsigned cb;
         if (!(uch & RT_BIT(5)))
@@ -1375 +1374 @@
     {
         /* figure the length and validate the first octet. */
+/** @todo RT_USE_RTC_3629 */
         unsigned cb;
         if (!(uch & RT_BIT(5)))
@@ -1500 +1500 @@
     else if (uc < 0x00010000)
     {
+/** @todo RT_USE_RTC_3629 */
         if (   uc < 0x0000d8000
              || (   uc > 0x0000dfff
@@ -1514 +1515 @@
         }
     }
+/** @todo RT_USE_RTC_3629 */
     else if (uc < 0x00200000)
     {