Changeset 21744 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Jul 21, 2009 12:29:43 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50321

Message:

iprt/utf-8.cpp: dropped some unnecessary bits and fixed theoretical pointer wrapping with ancient compilers.

File:

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

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

@@ -189 +189 @@
  * @param   paCps   Where to store the code points array.
  * @param   cCps    The number of RTUNICP items the paCps buffer can hold, excluding the terminator ('\\0').
- * @param   pcCps   Where to store the actual number of decoded code points. This excludes the terminator.
  */
-static int rtUtf8Decode(const char *psz, size_t cch, PRTUNICP paCps, size_t cCps, size_t *pcCps)
-{
-    int                     rc = VINF_SUCCESS;
+static int rtUtf8Decode(const char *psz, size_t cch, PRTUNICP paCps, size_t cCps)
+{
+    int                     rc   = VINF_SUCCESS;
     const unsigned char    *puch = (const unsigned char *)psz;
-    const PRTUNICP          pCpEnd = paCps + cCps;
-    PRTUNICP                pCp = paCps;
-    Assert(pCpEnd >= pCp);
+    PRTUNICP                pCp  = paCps;
     while (cch > 0)
     {
@@ -206 +203 @@
 
         /* check for output overflow */
-        if (pCp >= pCpEnd)
+        if (RT_UNLIKELY(cCps < 1))
         {
             rc = VERR_BUFFER_OVERFLOW;
             break;
         }
+        cCps--;
 
         /* decode and recode the code point */
@@ -273 +271 @@
     /* done */
     *pCp = 0;
-    *pcCps = pCp - paCps;
     return rc;
 }
@@ -363 +360 @@
              * Decode the string.
              */
-            rc = rtUtf8Decode(pszString, RTSTR_MAX, paCps, cCps, &cCps);
+            rc = rtUtf8Decode(pszString, RTSTR_MAX, paCps, cCps);
             if (RT_SUCCESS(rc))
             {
@@ -422 +419 @@
              * Encode the UTF-16 string.
              */
-            rc = rtUtf8Decode(pszString, cchString, paCpsResult, cCps - 1, &cCpsResult);
+            rc = rtUtf8Decode(pszString, cchString, paCpsResult, cCps - 1);
             if (RT_SUCCESS(rc))
             {
@@ -585 +582 @@
  * @param   pwsz    Where to store the UTF-16 string.
  * @param   cwc     The number of RTUTF16 items the pwsz buffer can hold, excluding the terminator ('\\0').
- * @param   pcwc    Where to store the actual number of RTUTF16 items encoded into the UTF-16. This excludes the terminator.
  */
-static int rtUtf8RecodeAsUtf16(const char *psz, size_t cch, PRTUTF16 pwsz, size_t cwc, size_t *pcwc)
-{
-    int                     rc = VINF_SUCCESS;
+static int rtUtf8RecodeAsUtf16(const char *psz, size_t cch, PRTUTF16 pwsz, size_t cwc)
+{
+    int                     rc   = VINF_SUCCESS;
     const unsigned char    *puch = (const unsigned char *)psz;
-    const PRTUTF16          pwszEnd = pwsz + cwc;
-    PRTUTF16                pwc = pwsz;
-    Assert(pwszEnd >= pwc);
+    PRTUTF16                pwc  = pwsz;
     while (cch > 0)
     {
@@ -602 +596 @@
 
         /* check for output overflow */
-        if (pwc >= pwszEnd)
+        if (RT_UNLIKELY(cwc < 1))
         {
             rc = VERR_BUFFER_OVERFLOW;
             break;
         }
+        cwc--;
 
         /* decode and recode the code point */
@@ -640 +635 @@
                        | ((RTUNICP)(puch[1] & 0x3f) << 12)
                        | ((RTUNICP)(uch     & 0x07) << 18);
-            if (pwc + 1 >= pwszEnd)
+            if (RT_UNLIKELY(cwc < 1))
             {
                 rc = VERR_BUFFER_OVERFLOW;
                 break;
             }
+            cwc--;
+
             uc -= 0x10000;
             *pwc++ = 0xd800 | (uc >> 10);
@@ -655 +652 @@
     /* done */
     *pwc = '\0';
-    *pcwc = pwc - pwsz;
     return rc;
 }
@@ -685 +681 @@
              * Encode the UTF-16 string.
              */
-            rc = rtUtf8RecodeAsUtf16(pszString, RTSTR_MAX, pwsz, cwc, &cwc);
+            rc = rtUtf8RecodeAsUtf16(pszString, RTSTR_MAX, pwsz, cwc);
             if (RT_SUCCESS(rc))
             {
@@ -744 +740 @@
              * Encode the UTF-16 string.
              */
-            rc = rtUtf8RecodeAsUtf16(pszString, cchString, pwszResult, cwc - 1, &cwcResult);
+            rc = rtUtf8RecodeAsUtf16(pszString, cchString, pwszResult, cwc - 1);
             if (RT_SUCCESS(rc))
             {