Changeset 66361 in vbox

Timestamp:

Mar 30, 2017 1:44:39 PM (8 years ago)

Author:

vboxsync

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

114302

Message:

IPRT: Adding RTStrICmpAscii (mirrors RTUtf16ICmpAscii).

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/string.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (4 diffs)
• src/VBox/Runtime/common/string/RTStrICmpAscii.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp ) (1 diff)

trunk/include/iprt/mangling.h

@@ -1838 +1838 @@
 # define RTStrHash1N                                    RT_MANGLER(RTStrHash1N)
 # define RTStrICmp                                      RT_MANGLER(RTStrICmp)
+# define RTStrICmpAscii                                 RT_MANGLER(RTStrICmpAscii)
 # define RTStrIStartsWith                               RT_MANGLER(RTStrIStartsWith)
 # define RTStrIStr                                      RT_MANGLER(RTStrIStr)

trunk/include/iprt/string.h

@@ -2212 +2212 @@
 
 /**
+ * Performs a case insensitive string compare between a UTF-8 string and a 7-bit
+ * ASCII string.
+ *
+ * This is potentially faster than RTStrICmp and drags in less dependencies.  It
+ * is really handy for hardcoded inputs.
+ *
+ * If the string encoding is invalid the function will assert (strict builds)
+ * and use RTStrCmp for the remainder of the string.
+ *
+ * @returns < 0 if the first string less than the second string.
+ * @returns 0 if the first string identical to the second string.
+ * @returns > 0 if the first string greater than the second string.
+ * @param   psz1        First UTF-8 string. Null is allowed.
+ * @param   psz2        Second string, 7-bit ASCII. Null is allowed.
+ * @sa      RTUtf16ICmpAscii
+ */
+RTDECL(int) RTStrICmpAscii(const char *psz1, const char *psz2);
+
+/**
  * Checks whether @a pszString starts with @a pszStart.
  *

trunk/src/VBox/Runtime/Makefile.kmk

@@ -538 +538 @@
         common/string/RTStrStartsWith.cpp \
         common/string/RTStrIStartsWith.cpp \
+        common/string/RTStrICmpAscii.cpp \
         common/string/RTStrStr.cpp \
         common/string/RTUtf16Copy.cpp \
@@ -1883 +1884 @@
         common/string/RTStrCopyP.cpp \
         common/string/RTStrCopyPEx.cpp \
+        common/string/RTStrCmp.cpp \
+        common/string/RTStrICmpAscii.cpp \
         common/string/RTStrNLen.cpp \
         common/string/RTStrNLenEx.cpp \
@@ -2063 +2066 @@
         common/string/RTStrCopyP.cpp \
         common/string/RTStrCopyPEx.cpp \
+        common/string/RTStrICmpAscii.cpp \
         common/string/RTStrNCmp.cpp \
         common/string/RTStrNLen.cpp \
@@ -2594 +2598 @@
         common/string/strprintf.cpp \
         common/string/strprintf2.cpp \
+        common/string/RTStrCmp.cpp \
         common/string/RTStrCopy.cpp \
         common/string/RTStrCopyEx.cpp \
+        common/string/RTStrICmpAscii.cpp \
         common/table/avllu32.cpp \
         common/table/avlou32.cpp \

trunk/src/VBox/Runtime/common/string/RTStrICmpAscii.cpp

@@ -36 +36 @@
 
 
-RTDECL(int) RTUtf16ICmpAscii(PCRTUTF16 pwsz1, const char *psz2)
+RTDECL(int) RTStrICmpAscii(const char *psz1, const char *psz2)
 {
+    if (psz1 == psz2)
+        return 0;
+    if (!psz1)
+        return -1;
+    if (!psz2)
+        return 1;
+
     for (;;)
     {
-        RTUTF16         wc1  = *pwsz1++;
-        unsigned char   uch2 = *psz2++; Assert(uch2 < 0x80);
-        if (wc1 != uch2)
+        RTUNICP uc1;
+        int rc = RTStrGetCpEx(&psz1, &uc1);
+        if (RT_SUCCESS(rc))
         {
-            if (wc1 >= 0x80)
-                return 1;
-            if (RT_C_TO_LOWER(wc1) != RT_C_TO_LOWER(uch2))
-                return wc1 < uch2 ? -1 : 1;
+            unsigned char uch2 = *psz2++; Assert(uch2 < 0x80);
+
+            /* compare */
+            int iDiff = uc1 - uch2;
+            if (iDiff)
+            {
+                if (uc1 >= 0x80)
+                    return 1;
+
+                iDiff = RT_C_TO_LOWER(uc1) - RT_C_TO_LOWER(uch2); /* Return lower cased diff! */
+                if (iDiff)
+                    return iDiff;
+            }
+
+            if (uch2)
+            { /* likely */ }
+            else
+                return 0;
         }
-        if (!uch2)
-            return 0;
+        /* Hit some bad encoding, continue in case sensitive mode. */
+        else
+            return RTStrCmp(psz1 - 1, psz2);
     }
 }
-RT_EXPORT_SYMBOL(RTUtf16ICmpAscii);
+RT_EXPORT_SYMBOL(RTStrICmpAscii);