Changeset 25013 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Nov 26, 2009 3:22:46 PM (15 years ago)

Author:

vboxsync

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

55325

Message:

VBoxSDL: -Wshadow warnings

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -858 +858 @@
     HRESULT rc;
     int vrc;
-    Guid uuid;
+    Guid uuidVM;
     char *vmName = NULL;
     DeviceType_T bootDevice = DeviceType_Null;
@@ -1045 +1045 @@
             }
             // first check if a UUID was supplied
-            if (RT_FAILURE(RTUuidFromStr(uuid.ptr(), argv[curArg])))
+            if (RT_FAILURE(RTUuidFromStr(uuidVM.ptr(), argv[curArg])))
             {
                 LogFlow(("invalid UUID format, assuming it's a VM name\n"));
@@ -1456 +1456 @@
      * Do we have a name but no UUID?
      */
-    if (vmName && uuid.isEmpty())
+    if (vmName && uuidVM.isEmpty())
     {
         ComPtr<IMachine> aMachine;
@@ -1465 +1465 @@
             Bstr id;
             aMachine->COMGETTER(Id)(id.asOutParam());
-            uuid = Guid(id);
+            uuidVM = Guid(id);
         }
         else
@@ -1473 +1473 @@
         }
     }
-    else if (uuid.isEmpty())
+    else if (uuidVM.isEmpty())
     {
         RTPrintf("Error: no machine specified!\n");
@@ -1483 +1483 @@
     AssertReleaseRC(vrc);
 
-    rc = virtualBox->OpenSession(session, uuid.toUtf16());
+    rc = virtualBox->OpenSession(session, uuidVM.toUtf16());
     if (FAILED(rc))
     {
@@ -1544 +1544 @@
              * Go and attach it!
              */
-            Bstr uuid;
+            Bstr uuidHD;
             Bstr storageCtlName;
-            hardDisk->COMGETTER(Id)(uuid.asOutParam());
+            hardDisk->COMGETTER(Id)(uuidHD.asOutParam());
 
             /* get the first IDE controller to attach the harddisk to
@@ -1581 +1581 @@
             }
 
-            gMachine->AttachDevice(storageCtlName, 0, 0, DeviceType_HardDisk, uuid);
+            gMachine->AttachDevice(storageCtlName, 0, 0, DeviceType_HardDisk, uuidHD);
             /// @todo why is this attachment saved?
         }
@@ -2406 +2406 @@
                         {
                             /* potential host key combination, try execute it */
-                            int rc = HandleHostKey(&event.key);
-                            if (rc == VINF_SUCCESS)
+                            int irc = HandleHostKey(&event.key);
+                            if (irc == VINF_SUCCESS)
                             {
                                 enmHKeyState = HKEYSTATE_USED;
                                 break;
                             }
-                            if (RT_SUCCESS(rc))
+                            if (RT_SUCCESS(irc))
                                 goto leave;
                         }
@@ -2448 +2448 @@
                         if (event.type == SDL_KEYDOWN)
                         {
-                            int rc = HandleHostKey(&event.key);
-                            if (RT_SUCCESS(rc) && rc != VINF_SUCCESS)
+                            int irc = HandleHostKey(&event.key);
+                            if (RT_SUCCESS(irc) && irc != VINF_SUCCESS)
                                 goto leave;
                         }