Changeset 25771 in vbox for trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

Timestamp:

Jan 12, 2010 4:20:35 PM (15 years ago)

Author:

vboxsync

Message:

*: Shut up -Wshadow warnings.

File:

• trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (13 diffs)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -125 +125 @@
 *******************************************************************************/
 
-PVM                pVM              = NULL;
+PVM                gpVM             = NULL;
 Mouse             *gMouse           = NULL;
 VMDisplay         *gDisplay         = NULL;
@@ -956 +956 @@
     LogFlow(("Returning from main()!\n"));
 
-    if (pVM)
+    if (gpVM)
     {
         /*
@@ -966 +966 @@
         {
             /* Power off VM */
-            rc = VMR3PowerOff(pVM);
+            rc = VMR3PowerOff(gpVM);
             AssertRC(rc);
         }
 
         /* And destroy it */
-        rc = VMR3Destroy(pVM);
+        rc = VMR3Destroy(gpVM);
         AssertRC(rc);
     }
@@ -1140 +1140 @@
     {
         static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
-        static char szError[RTPATH_MAX + 128] = "";
+        static char s_szError[RTPATH_MAX + 128] = "";
         PRTLOGGER pLogger;
         rc2 = RTLogCreateEx(&pLogger, RTLOGFLAGS_PREFIX_TIME_PROG, "all",
                             "VBOX_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups,
-                            RTLOGDEST_FILE, szError, sizeof(szError), "./VBoxBFE.log");
+                            RTLOGDEST_FILE, s_szError, sizeof(s_szError), "./VBoxBFE.log");
         if (RT_SUCCESS(rc2))
         {
@@ -1161 +1161 @@
         }
         else
-            RTPrintf("Could not open release log (%s)\n", szError);
+            RTPrintf("Could not open release log (%s)\n", s_szError);
     }
 
@@ -1172 +1172 @@
      * Create empty VM.
      */
-    rc = VMR3Create(1, setVMErrorCallback, NULL, vboxbfeConfigConstructor, NULL, &pVM);
+    rc = VMR3Create(1, setVMErrorCallback, NULL, vboxbfeConfigConstructor, NULL, &gpVM);
     if (RT_FAILURE(rc))
     {
@@ -1183 +1183 @@
      * Register VM state change handler
      */
-    rc = VMR3AtStateRegister(pVM, vmstateChangeCallback, NULL);
+    rc = VMR3AtStateRegister(gpVM, vmstateChangeCallback, NULL);
     if (RT_FAILURE(rc))
     {
@@ -1202 +1202 @@
             int              cbString;
             PRTUTF16         aHostPath, aMapName;
-            int              rc;
-
-            rc = RTStrToUtf16(g_pszShareDir[i], &aHostPath);
-            AssertRC(rc);
-            rc = RTStrToUtf16(g_pszShareName[i], &aMapName);
-            AssertRC(rc);
+
+            rc2 = RTStrToUtf16(g_pszShareDir[i], &aHostPath);
+            AssertRC(rc2);
+            rc2 = RTStrToUtf16(g_pszShareName[i], &aMapName);
+            AssertRC(rc2);
 
             cbString = (RTUtf16Len (aHostPath) + 1) * sizeof (RTUTF16);
@@ -1236 +1235 @@
             parms[2].u.uint32 = !g_fShareReadOnly[i];
 
-            rc = gVMMDev->hgcmHostCall ("VBoxSharedFolders",
-                                        SHFL_FN_ADD_MAPPING, SHFL_CPARMS_ADD_MAPPING, &parms[0]);
-            AssertRC(rc);
+            rc2 = gVMMDev->hgcmHostCall ("VBoxSharedFolders",
+                                         SHFL_FN_ADD_MAPPING, SHFL_CPARMS_ADD_MAPPING, &parms[0]);
+            AssertRC(rc2);
             LogRel(("Added share %s: (%s)\n", g_pszShareName[i], g_pszShareDir[i]));
             RTMemFree (pFolderName);
@@ -1255 +1254 @@
     {
         gHostUSB = new HostUSB();
-        gHostUSB->init(pVM);
+        gHostUSB->init(gpVM);
     }
 #endif /* VBOXBFE_WITH_USB */
@@ -1277 +1276 @@
         {
             startProgressInfo("Restoring");
-            rc = VMR3LoadFromFile(pVM, g_pszStateFile, callProgressInfo, (uintptr_t)NULL);
+            rc = VMR3LoadFromFile(gpVM, g_pszStateFile, callProgressInfo, (uintptr_t)NULL);
             endProgressInfo();
             if (RT_SUCCESS(rc))
             {
-                rc = VMR3Resume(pVM);
+                rc = VMR3Resume(gpVM);
                 AssertRC(rc);
                 gDisplay->setRunning();
@@ -1290 +1289 @@
         else
         {
-            rc = VMR3PowerOn(pVM);
+            rc = VMR3PowerOn(gpVM);
             if (RT_FAILURE(rc))
                 AssertMsgFailed(("VMR3PowerOn failed, rc=%Rrc\n", rc));
@@ -1305 +1304 @@
 
 failure:
-    if (pVM)
-    {
-        rc2 = VMR3Destroy(pVM);
+    if (gpVM)
+    {
+        rc2 = VMR3Destroy(gpVM);
         AssertRC(rc2);
-        pVM = NULL;
+        gpVM = NULL;
     }
     machineState = VMSTATE_TERMINATED;