Changeset 2239 in vbox for trunk

Timestamp:

Apr 19, 2007 4:30:43 PM (18 years ago)

Author:

vboxsync

Message:

Main: Use RTPathCompare() instead of #ifdef's.

File:

• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3144 +3144 @@
     }
 
-    // then iterate and find by name
+    /* then iterate and find by name */
     bool found = false;
     if (aFilePathFull)
@@ -3157 +3157 @@
                 continue;
 
-            found =
-#if defined (__LINUX__)
-                 hd->asVDI()->filePathFull() == aFilePathFull;
-#else
-                 !hd->asVDI()->filePathFull().compareIgnoreCase (aFilePathFull);
-#endif
+            found = RTPathCompare (Utf8Str (aFilePathFull),
+                                   Utf8Str (hd->asVDI()->filePathFull())) == 0;
             if (found && aImage)
                 *aImage = hd->asVDI();
@@ -3222 +3218 @@
             found = (aId && (*it)->id() == *aId) ||
                     (aFilePathFull &&
-#if defined (__LINUX__)
-                        (*it)->filePathFull() == aFilePathFull);
-#else
-                        !(*it)->filePathFull().compareIgnoreCase (aFilePathFull));
-#endif
+                     RTPathCompare (Utf8Str (aFilePathFull),
+                                    Utf8Str ((*it)->filePathFull())) == 0);
             if (found && aImage)
                 *aImage = *it;
@@ -3286 +3279 @@
             found = (aId && (*it)->id() == *aId) ||
                     (aFilePathFull &&
-#if defined (__LINUX__)
-                        (*it)->filePathFull() == aFilePathFull);
-#else
-                        !(*it)->filePathFull().compareIgnoreCase (aFilePathFull));
-#endif
+                     RTPathCompare (Utf8Str (aFilePathFull),
+                                    Utf8Str ((*it)->filePathFull())) == 0);
             if (found && aImage)
                 *aImage = *it;
@@ -3373 +3363 @@
         if (!aHardDisk)
         {
-            rc = findVirtualDiskImage (aId, aFilePathFull, false /* aSetError */);
+            rc = findHardDisk (aId, aFilePathFull, false /* aSetError */);
             found = SUCCEEDED (rc);
             if (found)
@@ -3393 +3383 @@
     if (found)
     {
-        if (aId)
+        if (aId && !aFilePathFull)
             rc = setError (E_INVALIDARG,
                 tr ("A disk image with UUID {%Vuuid} is already registered"),
                 aId->raw());
-        else if (aFilePathFull)
+        else if (aFilePathFull && !aId)
             rc = setError (E_INVALIDARG,
                 tr ("A disk image with file path '%ls' is already registered"),