Changeset 25019 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 26, 2009 3:38:39 PM (15 years ago)

Author:

vboxsync

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

55333

Message:

VBoxManage: -Wshadow warnings

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageList.cpp (modified) (3 diffs)
• VBoxManageMetrics.cpp (modified) (1 diff)
• VBoxManageSnapshot.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -498 +498 @@
                 CHECK_ERROR(mediumFormats [i],
                             COMGETTER(FileExtensions) (ComSafeArrayAsOutParam (fileExtensions)));
-                for (size_t a = 0; a < fileExtensions.size(); ++ a)
-                {
-                    RTPrintf ("%ls", Bstr (fileExtensions [a]).raw());
-                    if (a != fileExtensions.size()-1)
+                for (size_t j = 0; j < fileExtensions.size(); ++ j)
+                {
+                    RTPrintf ("%ls", Bstr (fileExtensions [j]).raw());
+                    if (j != fileExtensions.size()-1)
                         RTPrintf (",");
                 }
@@ -522 +522 @@
                 if (propertyNames.size() > 0)
                 {
-                    for (size_t a = 0; a < propertyNames.size(); ++ a)
+                    for (size_t j = 0; j < propertyNames.size(); ++ j)
                     {
                         RTPrintf ("\n  name='%ls' desc='%ls' type=",
-                                Bstr (propertyNames [a]).raw(), Bstr (propertyDescriptions [a]).raw());
-                        switch (propertyTypes [a])
+                                Bstr (propertyNames [j]).raw(), Bstr (propertyDescriptions [j]).raw());
+                        switch (propertyTypes [j])
                         {
                             case DataType_Int32: RTPrintf ("int"); break;
@@ -532 +532 @@
                             case DataType_String: RTPrintf ("string"); break;
                         }
-                        RTPrintf (" flags=%#04x", propertyFlags [a]);
-                        RTPrintf (" default='%ls'", Bstr (propertyDefaults [a]).raw());
-                        if (a != propertyNames.size()-1)
+                        RTPrintf (" flags=%#04x", propertyFlags [j]);
+                        RTPrintf (" default='%ls'", Bstr (propertyDefaults [j]).raw());
+                        if (j != propertyNames.size()-1)
                             RTPrintf (", ");
                     }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp

@@ -505 +505 @@
                                                  ComSafeArrayAsOutParam(retLengths),
                                                  ComSafeArrayAsOutParam(retData)) );
-        for (unsigned i = 0; i < retNames.size(); i++)
-        {
-            Bstr metricUnit(retUnits[i]);
-            Bstr metricName(retNames[i]);
-            RTPrintf("%-12s %-10ls %-20ls ", ts, getObjectName(aVirtualBox, retObjects[i]).raw(), metricName.raw());
+        for (unsigned j = 0; j < retNames.size(); j++)
+        {
+            Bstr metricUnit(retUnits[j]);
+            Bstr metricName(retNames[j]);
+            RTPrintf("%-12s %-10ls %-20ls ", ts, getObjectName(aVirtualBox, retObjects[j]).raw(), metricName.raw());
             const char *separator = "";
-            for (unsigned j = 0; j < retLengths[i]; j++)
+            for (unsigned k = 0; k < retLengths[j]; k++)
             {
-                if (retScales[i] == 1)
-                    RTPrintf("%s%d %ls", separator, retData[retIndices[i] + j], metricUnit.raw());
+                if (retScales[j] == 1)
+                    RTPrintf("%s%d %ls", separator, retData[retIndices[j] + k], metricUnit.raw());
                 else
-                    RTPrintf("%s%d.%02d%ls", separator, retData[retIndices[i] + j] / retScales[i],
-                             (retData[retIndices[i] + j] * 100 / retScales[i]) % 100, metricUnit.raw());
+                    RTPrintf("%s%d.%02d%ls", separator, retData[retIndices[j] + k] / retScales[j],
+                             (retData[retIndices[j] + k] * 100 / retScales[j]) % 100, metricUnit.raw());
                 separator = ", ";
             }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp

@@ -240 +240 @@
     if (!pMachine)
         return 1;
-    Bstr guid;
-    pMachine->COMGETTER(Id)(guid.asOutParam());
+    Bstr guidMachine;
+    pMachine->COMGETTER(Id)(guidMachine.asOutParam());
 
     do
     {
         /* we have to open a session for this task. First try an existing session */
-        rc = a->virtualBox->OpenExistingSession(a->session, guid);
+        rc = a->virtualBox->OpenExistingSession(a->session, guidMachine);
         if (FAILED(rc))
-            CHECK_ERROR_BREAK(a->virtualBox, OpenSession(a->session, guid));
+            CHECK_ERROR_BREAK(a->virtualBox, OpenSession(a->session, guidMachine));
         ComPtr<IConsole> console;
         CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam()));
@@ -352 +352 @@
 
             /* assume it's a UUID */
-            Bstr guid(a->argv[2]);
-            if (!guid.isEmpty())
-            {
-                CHECK_ERROR_BREAK(pMachine, GetSnapshot(guid, pSnapshot.asOutParam()));
+            Bstr guidSnap(a->argv[2]);
+            if (!guidSnap.isEmpty())
+            {
+                CHECK_ERROR_BREAK(pMachine, GetSnapshot(guidSnap, pSnapshot.asOutParam()));
             }
             else
@@ -361 +361 @@
                 /* then it must be a name */
                 CHECK_ERROR_BREAK(pMachine, FindSnapshot(Bstr(a->argv[2]), pSnapshot.asOutParam()));
-                pSnapshot->COMGETTER(Id)(guid.asOutParam());
+                pSnapshot->COMGETTER(Id)(guidSnap.asOutParam());
             }
 
@@ -367 +367 @@
             if (fDelete)
             {
-                CHECK_ERROR_BREAK(console, DeleteSnapshot(guid, pProgress.asOutParam()));
+                CHECK_ERROR_BREAK(console, DeleteSnapshot(guidSnap, pProgress.asOutParam()));
             }
             else
@@ -404 +404 @@
             {
                 /* assume it's a UUID */
-                Bstr guid(a->argv[2]);
-                if (!guid.isEmpty())
-                {
-                    CHECK_ERROR_BREAK(pMachine, GetSnapshot(guid, snapshot.asOutParam()));
+                Bstr guidSnap(a->argv[2]);
+                if (!guidSnap.isEmpty())
+                {
+                    CHECK_ERROR_BREAK(pMachine, GetSnapshot(guidSnap, snapshot.asOutParam()));
                 }
                 else
@@ -467 +467 @@
 
             /* assume it's a UUID */
-            Bstr guid(a->argv[2]);
-            if (!guid.isEmpty())
-            {
-                CHECK_ERROR_BREAK(pMachine, GetSnapshot(guid, snapshot.asOutParam()));
+            Bstr guidSnap(a->argv[2]);
+            if (!guidSnap.isEmpty())
+            {
+                CHECK_ERROR_BREAK(pMachine, GetSnapshot(guidSnap, snapshot.asOutParam()));
             }
             else