Changeset 9743 in vbox

Timestamp:

Jun 16, 2008 10:53:02 PM (17 years ago)

Author:

vboxsync

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

32099

Message:

Made RTUuidCompare grok NULL pointers and behave the same way in both the generic and Windows implementation.

Location:

trunk

Files:

• include/iprt/uuid.h (modified) (2 diffs)
• src/VBox/Runtime/generic/uuid-generic.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/win/uuid-win.cpp (modified) (1 diff)

trunk/include/iprt/uuid.h

@@ -69 +69 @@
  *
  * @returns 0 if eq, < 0 or > 0.
- * @param   pUuid1          First value to compare.
- * @param   pUuid2          Second value to compare.
+ * @param   pUuid1          First value to compare. NULL is treated like if RTUuidIsNull() return true.
+ * @param   pUuid2          Second value to compare. NULL is treated like if RTUuidIsNull() return true.
  */
 RTDECL(int)  RTUuidCompare(PCRTUUID pUuid1, PCRTUUID pUuid2);
@@ -78 +78 @@
  *
  * @returns 0 if eq, < 0 or > 0.
- * @param   pUuid1          First value to compare.
- * @param   pszString2      The 2nd UUID in string form.
+ * @param   pUuid1          First value to compare. NULL is not allowed.
+ * @param   pszString2      The 2nd UUID in string form. NULL of malformed string is not permitted.
  */
 RTDECL(int)  RTUuidCompareStr(PCRTUUID pUuid1, const char *pszString);

trunk/src/VBox/Runtime/generic/uuid-generic.cpp

@@ -63 +63 @@
      * Special cases.
      */
-    /** @todo This differs in the windows implementation... check out which behavior we really want. */
     if (pUuid1 == pUuid2)
         return 0;
@@ -70 +69 @@
     if (!pUuid2)
         return RTUuidIsNull(pUuid1) ? 0 : 1;
-    AssertPtr(pUuid1);
-    AssertPtr(pUuid2);
+    AssertPtrReturn(pUuid1, -1);
+    AssertPtrReturn(pUuid2, 1);
 
     /*

trunk/src/VBox/Runtime/r3/win/uuid-win.cpp

@@ -63 +63 @@
 RTDECL(int)  RTUuidCompare(PCRTUUID pUuid1, PCRTUUID pUuid2)
 {
-    /* check params */
-    /** @todo this isn't working the same way as uuid-generic.cpp. */
+    /*
+     * Special cases.
+     */
+    if (pUuid1 == pUuid2)
+        return 0;
+    if (!pUuid1)
+        return RTUuidIsNull(pUuid2) ? 0 : -1;
+    if (!pUuid2)
+        return RTUuidIsNull(pUuid1) ? 0 : 1;
     AssertPtrReturn(pUuid1, -1);
-    AssertPtrReturn(pUuid1, 1);
+    AssertPtrReturn(pUuid2, 1);
 
+    /*
+     * Hand the rest to the Windows API.
+     */
     RPC_STATUS status;
     return UuidCompare((UUID *)pUuid1, (UUID *)pUuid2, &status);