Changeset 25015 in vbox

Timestamp:

Nov 26, 2009 3:27:42 PM (15 years ago)

Author:

vboxsync

Message:

VMM: a few more -Wshadow fixes.

Location:

trunk/src/VBox/VMM

Files:

• DBGFSym.cpp (modified) (1 diff)
• PDMLdr.cpp (modified) (2 diffs)
• PDMQueue.cpp (modified) (2 diffs)
• PGM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/DBGFSym.cpp

@@ -166 +166 @@
                 {
                     /* make new symbol space node. */
-                    PDBGFSYMSPACE pName = (PDBGFSYMSPACE)MMR3HeapAlloc(pVM, MM_TAG_DBGF_SYMBOL, sizeof(*pName) + cchName);
+                    pName = (PDBGFSYMSPACE)MMR3HeapAlloc(pVM, MM_TAG_DBGF_SYMBOL, sizeof(*pName) + cchName);
                     if (pName)
                     {

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -498 +498 @@
                             {
                                 /* we don't expect this list to be very long, so rather save the tail pointer. */
-                                PPDMMOD pCur = pUVM->pdm.s.pModules;
+                                pCur = pUVM->pdm.s.pModules;
                                 while (pCur->pNext)
                                     pCur = pCur->pNext;
@@ -603 +603 @@
         {
             /* we don't expect this list to be very long, so rather save the tail pointer. */
-            PPDMMOD pCur = pUVM->pdm.s.pModules;
+            pCur = pUVM->pdm.s.pModules;
             while (pCur->pNext)
                 pCur = pCur->pNext;

trunk/src/VBox/VMM/PDMQueue.cpp

@@ -123 +123 @@
     if (cMilliesInterval)
     {
-        int rc = TMR3TimerCreateInternal(pVM, TMCLOCK_REAL, pdmR3QueueTimer, pQueue, "Queue timer", &pQueue->pTimer);
+        rc = TMR3TimerCreateInternal(pVM, TMCLOCK_REAL, pdmR3QueueTimer, pQueue, "Queue timer", &pQueue->pTimer);
         if (RT_SUCCESS(rc))
         {
@@ -158 +158 @@
          * This is a FIFO, so insert at the end.
          */
-        /** @todo we should add a priority priority to the queues so we don't have to rely on
+        /** @todo we should add a priority to the queues so we don't have to rely on
          * the initialization order to deal with problems like #1605 (pgm/pcnet deadlock
          * caused by the critsect queue to be last in the chain).

trunk/src/VBox/VMM/PGM.cpp

@@ -1197 +1197 @@
 
     /* Init the per-CPU part. */
-    for (VMCPUID i = 0; i < pVM->cCpus; i++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[i];
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
         PPGMCPU pPGM = &pVCpu->pgm.s;
 
@@ -1376 +1376 @@
         if (!s_fRegisteredCmds)
         {
-            int rc = DBGCRegisterCommands(&g_aCmds[0], RT_ELEMENTS(g_aCmds));
-            if (RT_SUCCESS(rc))
+            int rc2 = DBGCRegisterCommands(&g_aCmds[0], RT_ELEMENTS(g_aCmds));
+            if (RT_SUCCESS(rc2))
                 s_fRegisteredCmds = true;
         }