Changeset 25780 in vbox

Timestamp:

Jan 12, 2010 5:02:35 PM (15 years ago)

Author:

vboxsync

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

56538

Message:

Misc: -Wshadow warnings.

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPCI.cpp (modified) (1 diff)
• Network/DevPCNet.cpp (modified) (2 diffs)
• PC/DevPcBios.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -998 +998 @@
 
                 /* Init devices behind the bridge and possibly other bridges as well. */
-                for (int i = 0; i <= 255; i++)
-                    pci_bios_init_device(pGlobals, uBus + 1, i, cBridgeDepth + 1, paBridgePositions);
+                for (int iDev = 0; iDev <= 255; iDev++)
+                    pci_bios_init_device(pGlobals, uBus + 1, iDev, cBridgeDepth + 1, paBridgePositions);
 
                 /* The number of bridges behind the this one is now available. */

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -1986 +1986 @@
 
                 cbBuf = RT_MIN(4096 - (size_t)rmd.rmd1.bcnt, cbToRecv);
-                RTGCPHYS32 rbadr = PHYSADDR(pThis, rmd.rmd0.rbadr);
+                RTGCPHYS32 rbadr2 = PHYSADDR(pThis, rmd.rmd0.rbadr);
 
                 /* We have to leave the critical section here or we risk deadlocking
@@ -1992 +1992 @@
                  * handler associated with it. See above for additional comments. */
                 PDMCritSectLeave(&pThis->CritSect);
-                PDMDevHlpPhysWrite(pDevIns, rbadr, src, cbBuf);
+                PDMDevHlpPhysWrite(pDevIns, rbadr2, src, cbBuf);
                 rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
                 AssertReleaseRC(rc);

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -525 +525 @@
         {
             PDMMEDIAGEOMETRY LCHSGeometry;
-            int rc = setLogicalDiskGeometry(pBase, apHDs[i], &LCHSGeometry);
-            AssertRC(rc);
+            int rc2 = setLogicalDiskGeometry(pBase, apHDs[i], &LCHSGeometry);
+            AssertRC(rc2);
 
             if (i < 4)
@@ -586 +586 @@
             {
                 PDMMEDIAGEOMETRY LCHSGeometry;
-                int rc = setLogicalDiskGeometry(pBase, apHDs[i], &LCHSGeometry);
+                rc = setLogicalDiskGeometry(pBase, apHDs[i], &LCHSGeometry);
                 AssertRC(rc);