Changeset 76096 in vbox

Timestamp:

Dec 10, 2018 2:40:04 AM (6 years ago)

Author:

vboxsync

Message:

IPRT: Added RTUtf16Chr.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/utf16.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/common/string/RTUtf16Chr.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/RTUtf16End.cpp ) (2 diffs)

trunk/include/iprt/mangling.h

@@ -3758 +3758 @@
 # define RTUtf16Cat                                     RT_MANGLER(RTUtf16Cat)
 # define RTUtf16CatAscii                                RT_MANGLER(RTUtf16CatAscii)
+# define RTUtf16Chr                                     RT_MANGLER(RTUtf16Chr)
 # define RTUtf16End                                     RT_MANGLER(RTUtf16End)
 # define RTUtf16ICmpAscii                               RT_MANGLER(RTUtf16ICmpAscii)

trunk/include/iprt/utf16.h

@@ -264 +264 @@
  */
 RTDECL(PCRTUTF16) RTUtf16End(PCRTUTF16 pwszString, size_t cwcMax);
+
+/**
+ * Finds a give UTF-16 character in a UTF-16 string.
+ *
+ * @returns Pointer to the first occurence of @a wc.
+ * @returns NULL if @a wc was not found.
+ *
+ * @param   pwszString  The string to search.
+ * @param   wc          The UTF-16 character to search for.
+ */
+RTDECL(PRTUTF16) RTUtf16Chr(PCRTUTF16 pwszString, RTUTF16 wc);
 
 /**

trunk/src/VBox/Runtime/Makefile.kmk

@@ -572 +572 @@
         common/string/RTUtf16Cat.cpp \
         common/string/RTUtf16CatAscii.cpp \
+        common/string/RTUtf16Chr.cpp \
         common/string/RTUtf16CmpAscii.cpp \
         common/string/RTUtf16ICmpAscii.cpp \
@@ -3067 +3068 @@
 RuntimeR0Drv_SOURCES.os2 = \
         common/path/RTPathFilenameUtf16.cpp \
+        common/string/RTUtf16Chr.cpp \
         common/string/memchr.asm \
         common/string/memcmp.asm \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - RTUtf16End.
+ * IPRT - RTUtf16Chr.
  */
 
@@ -33 +33 @@
 
 
-RTDECL(PCRTUTF16) RTUtf16End(PCRTUTF16 pwszString, size_t cwcMax)
+RTDECL(PRTUTF16) RTUtf16Chr(PCRTUTF16 pwszString, RTUTF16 wc)
 {
-    while (cwcMax-- > 0)
+    for (;;)
     {
-        if (!*pwszString)
-            return pwszString;
-        pwszString++;
+        RTUTF16 wcSrc = *pwszString;
+        if (wcSrc != wc)
+        {
+            if (wcSrc != '\0')
+                pwszString++;
+            else
+                return NULL;
+        }
+        else
+            return (PRTUTF16)pwszString;
     }
-    return NULL;
 }
-RT_EXPORT_SYMBOL(RTUtf16End);
+RT_EXPORT_SYMBOL(RTUtf16Chr);