Changeset 12924 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Oct 2, 2008 10:18:50 AM (17 years ago)

Author:

vboxsync

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

37336

Message:

warnings, fixed undefined retval

File:

• trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1606 +1606 @@
     int rc;
 
-    AssertReturn(iRegion <= 2 && enmType == PCI_ADDRESS_SPACE_MEM || enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
+    AssertReturn((iRegion <= 2 && enmType == PCI_ADDRESS_SPACE_MEM) || enmType == PCI_ADDRESS_SPACE_MEM_PREFETCH, VERR_INTERNAL_ERROR);
     Assert(pThis->pVMMDevRAMR3 != NULL);
     Assert(pThis->pVMMDevHeapR3 != NULL);
@@ -1630 +1630 @@
         }
     }
-    else
-    if (iRegion == 2)
+    else if (iRegion == 2)
     {
         if (GCPhysAddress != NIL_RTGCPHYS)
@@ -1654 +1653 @@
         }
     }
+    else
+        rc = VERR_INVALID_PARAMETER;
 
     return rc;