Changeset 25961 in vbox for trunk/src/VBox

Timestamp:

Jan 21, 2010 2:19:12 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: Added RTUuidCompare2Strs; renamed tstUuid to tstRTUuid.

Location:

trunk/src/VBox/Runtime

Files:

• generic/uuid-generic.cpp (modified) (3 diffs)
• r3/win/uuid-win.cpp (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (3 diffs)
• testcase/tstRTUuid.cpp (moved) (moved from trunk/src/VBox/Runtime/testcase/tstUuid.cpp ) (2 diffs)

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

@@ -137 +137 @@
 
 
-RTDECL(int)  RTUuidCompareStr(PCRTUUID pUuid1, const char *pszString)
+RTDECL(int)  RTUuidCompareStr(PCRTUUID pUuid1, const char *pszString2)
 {
     RTUUID Uuid2;
@@ -144 +144 @@
     /* check params */
     AssertPtrReturn(pUuid1, -1);
-    AssertPtrReturn(pszString, 1);
+    AssertPtrReturn(pszString2, 1);
 
     /*
      * Try convert the string to a UUID and then compare the two.
      */
-    rc = RTUuidFromStr(&Uuid2, pszString);
+    rc = RTUuidFromStr(&Uuid2, pszString2);
     AssertRCReturn(rc, 1);
 
@@ -155 +155 @@
 }
 RT_EXPORT_SYMBOL(RTUuidCompareStr);
+
+
+RTDECL(int)  RTUuidCompare2Strs(const char *pszString1, const char *pszString2)
+{
+    RTUUID Uuid1;
+    RTUUID Uuid2;
+    int rc;
+
+    /* check params */
+    AssertPtrReturn(pszString1, -1);
+    AssertPtrReturn(pszString2, 1);
+
+    /*
+     * Try convert the strings to UUIDs and then compare them.
+     */
+    rc = RTUuidFromStr(&Uuid1, pszString1);
+    AssertRCReturn(rc, -1);
+
+    rc = RTUuidFromStr(&Uuid2, pszString2);
+    AssertRCReturn(rc, 1);
+
+    return RTUuidCompare(&Uuid1, &Uuid2);
+}
+RT_EXPORT_SYMBOL(RTUuidCompare2Strs);
 
 

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

@@ -83 +83 @@
 
 
-RTDECL(int)  RTUuidCompareStr(PCRTUUID pUuid1, const char *pszString)
+RTDECL(int)  RTUuidCompareStr(PCRTUUID pUuid1, const char *pszString2)
 {
     /* check params */
     AssertPtrReturn(pUuid1, -1);
-    AssertPtrReturn(pszString, 1);
+    AssertPtrReturn(pszString2, 1);
 
     /*
@@ -93 +93 @@
      */
     RTUUID Uuid2;
-    int rc = RTUuidFromStr(&Uuid2, pszString);
+    int rc = RTUuidFromStr(&Uuid2, pszString2);
     AssertRCReturn(rc, 1);
 
     return RTUuidCompare(pUuid1, &Uuid2);
+}
+
+
+RTDECL(int)  RTUuidCompare2Strs(const char *pszString1, const char *pszString2)
+{
+    RTUUID Uuid1;
+    RTUUID Uuid2;
+    int rc;
+
+    /* check params */
+    AssertPtrReturn(pszString1, -1);
+    AssertPtrReturn(pszString2, 1);
+
+    /*
+     * Try convert the strings to UUIDs and then compare them.
+     */
+    rc = RTUuidFromStr(&Uuid1, pszString1);
+    AssertRCReturn(rc, -1);
+
+    rc = RTUuidFromStr(&Uuid2, pszString2);
+    AssertRCReturn(rc, 1);
+
+    return RTUuidCompare(&Uuid1, &Uuid2);
 }
 

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -114 +114 @@
         tstTSC \
         tstUtf8 \
-        tstUuid
+        tstRTUuid
 # tstSems
 PROGRAMS.win += \
@@ -342 +342 @@
 
 tstRTPath_TEMPLATE = VBOXR3TSTEXE
-tstRTPath_SOURCES  = tstRTPath.cpp
+tstRTPath_SOURCES = tstRTPath.cpp
 
 tstPrfRT_SOURCES = tstPrfRT.cpp
@@ -421 +421 @@
 tstTSC_CXXFLAGS.linux += -O3
 
-tstUuid_SOURCES = tstUuid.cpp
+tstRTUuid_TEMPLATE = VBOXR3TSTEXE
+tstRTUuid_SOURCES = tstRTUuid.cpp
 
 tstUtf8_SOURCES = tstUtf8.cpp

trunk/src/VBox/Runtime/testcase/tstRTUuid.cpp

@@ -44 +44 @@
 {
     RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstUuid", &hTest);
+    int rc = RTTestInitAndCreate("tstRTUuid", &hTest);
     if (rc)
         return rc;
@@ -88 +88 @@
     RTTEST_CHECK(hTest, RTUuidCompare(&Uuid, &Uuid2) == 0);
 
+    RTTestSub(hTest, "RTUuidCompareStr");
+    RTTEST_CHECK(hTest, RTUuidCompareStr(&Uuid, sz) == 0);
+    RTTEST_CHECK(hTest, RTUuidCompareStr(&Uuid, "00000000-0000-0000-0000-000000000000") > 0);
+    RTTEST_CHECK(hTest, RTUuidCompareStr(&UuidNull, "00000000-0000-0000-0000-000000000000") == 0);
+
+    RTTestSub(hTest, "RTUuidCompare2Strs");
+    RTTEST_CHECK(hTest, RTUuidCompare2Strs(sz, sz) == 0);
+    RTTEST_CHECK(hTest, RTUuidCompare2Strs(sz, "00000000-0000-0000-0000-000000000000") > 0);
+    RTTEST_CHECK(hTest, RTUuidCompare2Strs("00000000-0000-0000-0000-000000000000", sz) < 0);
+    RTTEST_CHECK(hTest, RTUuidCompare2Strs("00000000-0000-0000-0000-000000000000", "00000000-0000-0000-0000-000000000000") == 0);
+    RTTEST_CHECK(hTest, RTUuidCompare2Strs("d95d883b-f91d-4ce5-a5c5-d08bb6a85dec", "a56193c7-3e0b-4c03-9d66-56efb45082f7") > 0);
+    RTTEST_CHECK(hTest, RTUuidCompare2Strs("a56193c7-3e0b-4c03-9d66-56efb45082f7", "d95d883b-f91d-4ce5-a5c5-d08bb6a85dec") < 0);
 
     /*