Changeset 3320 in vbox

Timestamp:

Jun 27, 2007 3:12:10 PM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed unsigned/signed warnings.

File:

• trunk/src/VBox/Main/HardDiskImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -1073 +1073 @@
 
     /* try to guess the probe order by extension */
-    size_t first = -1;
+    size_t first = 0;
+    bool haveFirst = false;
     Utf8Str loc = aLocation;
     char *ext = RTPathExt (loc);
@@ -1082 +1083 @@
         {
             first = i;
+            haveFirst = true;
             break;
         }
@@ -1093 +1095 @@
     for (size_t i = 0; i < ELEMENTS (storageTypes); ++ i)
     {
-        size_t j = first == -1 ? i : i == 0 ? first : i == first ? 0 : i;
+        size_t j = !haveFirst ? i : i == 0 ? first : i == first ? 0 : i;
         switch (storageTypes [j].type)
         {
@@ -1130 +1132 @@
         Assert (FAILED (rc));
 
-        /* remember the first encountered error */
-        if (j == first)
+        /* remember the error of the matching class */
+        if (haveFirst && j == first)
         {
             firstRC = rc;
@@ -1138 +1140 @@
     }
 
-    if (first != -1)
+    if (haveFirst)
     {
         Assert (FAILED (firstRC));