Changeset 24989 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Nov 26, 2009 11:31:46 AM (15 years ago)

Author:

vboxsync

Message:

Main: enable -Wshadow gcc option to warn about shadowed variables and fix all resulting warnings; in particular, rename some stack and member variables and rename getter methods like id() to getId()

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1106 +1106 @@
 
     const OVFReader reader = *m->pReader;
-        // this is safe to access because this thread only gets started
-        // if pReader != NULL
+    // this is safe to access because this thread only gets started
+    // if pReader != NULL
 
     /* If an manifest file exists, verify the content. Therefor we need all
@@ -1167 +1167 @@
                           vrc);
         /* Cleanup */
-        for (size_t i=1; i < filesList.size(); ++i)
-            RTStrFree(pTestList[i].pszTestDigest);
+        for (size_t j = 1;
+             j < filesList.size();
+             ++j)
+            RTStrFree(pTestList[j].pszTestDigest);
         RTMemFree(pTestList);
         if (FAILED(rc))
@@ -1373 +1375 @@
                         /* We search for the first host network interface which
                          * is usable for bridged networking */
-                        for (size_t i=0; i < nwInterfaces.size(); ++i)
+                        for (size_t j = 0;
+                             j < nwInterfaces.size();
+                             ++j)
                         {
                             HostNetworkInterfaceType_T itype;
-                            rc = nwInterfaces[i]->COMGETTER(InterfaceType)(&itype);
+                            rc = nwInterfaces[j]->COMGETTER(InterfaceType)(&itype);
                             if (FAILED(rc)) throw rc;
                             if (itype == HostNetworkInterfaceType_Bridged)
                             {
                                 Bstr name;
-                                rc = nwInterfaces[i]->COMGETTER(Name)(name.asOutParam());
+                                rc = nwInterfaces[j]->COMGETTER(Name)(name.asOutParam());
                                 if (FAILED(rc)) throw rc;
                                 /* Set the interface name to attach to */
@@ -1404 +1408 @@
                         /* We search for the first host network interface which
                          * is usable for host only networking */
-                        for (size_t i=0; i < nwInterfaces.size(); ++i)
+                        for (size_t j = 0;
+                             j < nwInterfaces.size();
+                             ++j)
                         {
                             HostNetworkInterfaceType_T itype;
-                            rc = nwInterfaces[i]->COMGETTER(InterfaceType)(&itype);
+                            rc = nwInterfaces[j]->COMGETTER(InterfaceType)(&itype);
                             if (FAILED(rc)) throw rc;
                             if (itype == HostNetworkInterfaceType_HostOnly)
                             {
                                 Bstr name;
-                                rc = nwInterfaces[i]->COMGETTER(Name)(name.asOutParam());
+                                rc = nwInterfaces[j]->COMGETTER(Name)(name.asOutParam());
                                 if (FAILED(rc)) throw rc;
                                 /* Set the interface name to attach to */
@@ -1567 +1573 @@
 
                     // CD-ROMs next
-                    for (std::list<VirtualSystemDescriptionEntry*>::const_iterator it = vsdeCDROM.begin();
-                        it != vsdeCDROM.end();
-                        ++it)
+                    for (std::list<VirtualSystemDescriptionEntry*>::const_iterator jt = vsdeCDROM.begin();
+                         jt != vsdeCDROM.end();
+                         ++jt)
                     {
                         // for now always attach to secondary master on IDE controller;
                         // there seems to be no useful information in OVF where else to
-                        // attach it (@todo test with latest versions of OVF software)
+                        // attach jt (@todo test with latest versions of OVF software)
 
                         // find the IDE controller
                         const HardDiskController *pController = NULL;
-                        for (ControllersMap::const_iterator it = vsysThis.mapControllers.begin();
-                             it != vsysThis.mapControllers.end();
-                             ++it)
+                        for (ControllersMap::const_iterator kt = vsysThis.mapControllers.begin();
+                             kt != vsysThis.mapControllers.end();
+                             ++kt)
                         {
-                            if (it->second.system == HardDiskController::IDE)
+                            if (kt->second.system == HardDiskController::IDE)
                             {
-                                pController = &it->second;
+                                pController = &kt->second;
                             }
                         }
@@ -4388 +4394 @@
     CheckComRCReturnRC(autoCaller.rc());
 
-    AutoReadLock alock(this);
+    AutoReadLock alock1(this);
 
     ComObjPtr<VirtualSystemDescription> pNewDesc;
@@ -4394 +4400 @@
     try
     {
-        Bstr bstrName;
+        Bstr bstrName1;
         Bstr bstrDescription;
         Bstr bstrGuestOSType;
@@ -4407 +4413 @@
 
         // get name
-        bstrName = mUserData->mName;
+        bstrName1 = mUserData->mName;
         // get description
         bstrDescription = mUserData->mDescription;
@@ -4454 +4460 @@
 
         /* VM name */
-        Utf8Str strVMName(bstrName);
+        Utf8Str strVMName(bstrName1);
         pNewDesc->addEntry(VirtualSystemDescriptionType_Name,
                            "",