Changeset 7420 in vbox

Timestamp:

Mar 10, 2008 4:13:56 PM (17 years ago)

Author:

vboxsync

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

28854

Message:

Added RTStrCmp. Added missing NULL handling in RTStrICmp.

Location:

trunk

Files:

• include/iprt/string.h (modified) (2 diffs)
• src/VBox/Runtime/common/string/utf-8.cpp (modified) (2 diffs)

trunk/include/iprt/string.h

@@ -1083 +1083 @@
 
 /**
+ * Performs a case sensitive string compare between two UTF-8 strings.
+ *
+ * Encoding errors are ignored by the current implementation. So, the only
+ * difference between this and the CRT strcmp function is the handling of
+ * NULL arguments.
+ *
+ * @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 UTF-8 string. Null is allowed.
+ */
+RTDECL(int) RTStrCmp(const char *psz1, const char *psz2);
+
+/**
  * Performs a case insensitive string compare between two UTF-8 strings.
  *
@@ -1092 +1107 @@
  * @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.
- * @param   psz2        Second UTF-8 string.
+ * @param   psz1        First UTF-8 string. Null is allowed.
+ * @param   psz2        Second UTF-8 string. Null is allowed.
  */
 RTDECL(int) RTStrICmp(const char *psz1, const char *psz2);

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

@@ -964 +964 @@
 
 /**
+ * Performs a case sensitive string compare between two UTF-8 strings.
+ *
+ * Encoding errors are ignored by the current implementation. So, the only
+ * difference between this and the CRT strcmp function is the handling of
+ * NULL arguments.
+ *
+ * @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 UTF-8 string. Null is allowed.
+ */
+RTDECL(int) RTStrCmp(const char *psz1, const char *psz2)
+{
+    if (psz1 == psz2)
+        return 0;
+    if (!psz1)
+        return -1;
+    if (!psz2)
+        return 1;
+
+    return strcmp(psz1, psz2);
+}
+
+
+/**
  * Performs a case insensitive string compare between two UTF-8 strings.
  *
@@ -973 +999 @@
  * @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.
- * @param   psz2        Second UTF-8 string.
+ * @param   psz1        First UTF-8 string. Null is allowed.
+ * @param   psz2        Second UTF-8 string. Null is allowed.
  */
 RTDECL(int) RTStrICmp(const char *psz1, const char *psz2)
 {
+    if (psz1 == psz2)
+        return 0;
+    if (!psz1)
+        return -1;
+    if (!psz2)
+        return 1;
+
     /** @todo implement proper UTF-8 case-insensitive string comparison. */
 #ifdef RT_OS_WINDOWS