Changeset 7345 in vbox

Timestamp:

Mar 6, 2008 9:16:50 PM (17 years ago)

Author:

vboxsync

Message:

Main/Glue/string: Don't strcmp NULL.

File:

• trunk/include/VBox/com/string.h (modified) (6 diffs)

trunk/include/VBox/com/string.h

@@ -130 +130 @@
     int compare (const BSTR str) const
     {
-        return ::RTStrUcs2Cmp ((PRTUCS2) bstr, (PRTUCS2) str);
+        return ::RTUtf16Cmp ((PRTUTF16) bstr, (PRTUTF16) str);
     }
 
@@ -165 +165 @@
     bool isEmpty() const { return isNull() || *bstr == 0; }
 
-    size_t length() const { return isNull() ? 0 : ::RTStrUcs2Len ((PRTUCS2) bstr); }
+    size_t length() const { return isNull() ? 0 : ::RTUtf16Len ((PRTUTF16) bstr); }
 
     /** Intended to to pass instances as |BSTR| input parameters to methods. */
@@ -252 +252 @@
         if (rs)
         {
-            PRTUCS2 s = NULL;
-            ::RTStrUtf8ToUcs2 (&s, rs);
+            PRTUTF16 s = NULL;
+            ::RTStrToUtf16 (rs, &s);
             raw_copy (ls, (BSTR) s);
-            ::RTStrUcs2Free (s);
+            ::RTUtf16Free (s);
         }
     }
@@ -272 +272 @@
 /**
  *  Helper class that represents UTF8 (|char *|) strings. Useful in
- *  conjunction with Bstr to simplify conversions beetween UCS2 (|BSTR|)
+ *  conjunction with Bstr to simplify conversions beetween UTF16 (|BSTR|)
  *  and UTF8.
  *
@@ -371 +371 @@
     int compare (const char *s) const
     {
-        return str == s ? 0 : ::strcmp (str, s);
+        if (str == s)
+            return 0;
+        if (str == NULL)
+            return -1;
+        if (s == NULL)
+            return 1;
+
+        return ::strcmp (str, s);
     }
 
@@ -486 +493 @@
         {
 #if !defined (VBOX_WITH_XPCOM)
-            ::RTStrUcs2ToUtf8 (&ls, (PRTUCS2) rs);
+            ::RTUtf16ToUtf8 ((PRTUTF16) rs, &ls);
 #else
             char *s = NULL;
-            ::RTStrUcs2ToUtf8 (&s, (PRTUCS2) rs);
+            ::RTUtf16ToUtf8 ((PRTUTF16) rs, &s);
             raw_copy (ls, s);
             ::RTStrFree (s);