Changeset 24998 in vbox

Timestamp:

Nov 26, 2009 1:22:55 PM (15 years ago)

Author:

vboxsync

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

55304

Message:

VBoxManage: fix shadow warnings

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (3 diffs)
• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageDisk.cpp (modified) (6 diffs)
• VBoxManageImport.cpp (modified) (4 diffs)

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

@@ -443 +443 @@
     if (argc >= 3)
     {
-        int rc = RTStrToInt64Ex(argv[2], NULL, 0, &offDelta);
-        if (RT_FAILURE(rc))
+        int irc = RTStrToInt64Ex(argv[2], NULL, 0, &offDelta);
+        if (RT_FAILURE(irc))
             return errorArgument(argv[0], "Failed to read delta '%s', rc=%Rrc\n", argv[2], rc);
     }
@@ -455 +455 @@
     if (argc >= 5)
     {
-        int rc = RTStrToUInt64Ex(argv[4], NULL, 0, &ModuleAddress);
-        if (RT_FAILURE(rc))
+        int irc = RTStrToUInt64Ex(argv[4], NULL, 0, &ModuleAddress);
+        if (RT_FAILURE(irc))
             return errorArgument(argv[0], "Failed to read module address '%s', rc=%Rrc\n", argv[4], rc);
     }
@@ -463 +463 @@
     if (argc >= 6)
     {
-        int rc = RTStrToUInt64Ex(argv[5], NULL, 0, &ModuleSize);
-        if (RT_FAILURE(rc))
+        int irc = RTStrToUInt64Ex(argv[5], NULL, 0, &ModuleSize);
+        if (RT_FAILURE(irc))
             return errorArgument(argv[0], "Failed to read module size '%s', rc=%Rrc\n", argv[5], rc);
     }

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

@@ -194 +194 @@
                 {
                     uint8_t u8Scancode;
-                    int rc = RTStrToUInt8Ex(a->argv[i], NULL, 16, &u8Scancode);
-                    if (RT_FAILURE (rc))
+                    int irc = RTStrToUInt8Ex(a->argv[i], NULL, 16, &u8Scancode);
+                    if (RT_FAILURE (irc))
                     {
                         RTPrintf("Error: converting '%s' returned %Rrc!\n", a->argv[i], rc);

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

@@ -460 +460 @@
             {
                 char szFilenameAbs[RTPATH_MAX] = "";
-                int vrc = RTPathAbs(FilenameOrUuid, szFilenameAbs, sizeof(szFilenameAbs));
-                if (RT_FAILURE(vrc))
+                int irc = RTPathAbs(FilenameOrUuid, szFilenameAbs, sizeof(szFilenameAbs));
+                if (RT_FAILURE(irc))
                 {
                     RTPrintf("Cannot convert filename \"%s\" to absolute path\n", FilenameOrUuid);
@@ -620 +620 @@
         {
             char szFilenameAbs[RTPATH_MAX] = "";
-            int vrc = RTPathAbs(Utf8Str(src).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
-            if (RT_FAILURE(vrc))
+            int irc = RTPathAbs(Utf8Str(src).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
+            if (RT_FAILURE(irc))
             {
                 RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(src).raw());
@@ -654 +654 @@
                 {
                     char szFilenameAbs[RTPATH_MAX] = "";
-                    int vrc = RTPathAbs(Utf8Str(dst).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
-                    if (RT_FAILURE(vrc))
+                    int irc = RTPathAbs(Utf8Str(dst).c_str(), szFilenameAbs, sizeof(szFilenameAbs));
+                    if (RT_FAILURE(irc))
                     {
                         RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Utf8Str(dst).raw());
@@ -1405 +1405 @@
         {
             char szFilenameAbs[RTPATH_MAX] = "";
-            int vrc = RTPathAbs(Filename, szFilenameAbs, sizeof(szFilenameAbs));
-            if (RT_FAILURE(vrc))
+            int irc = RTPathAbs(Filename, szFilenameAbs, sizeof(szFilenameAbs));
+            if (RT_FAILURE(irc))
             {
                 RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Filename);
@@ -1434 +1434 @@
         {
             char szFilenameAbs[RTPATH_MAX] = "";
-            int vrc = RTPathAbs(Filename, szFilenameAbs, sizeof(szFilenameAbs));
-            if (RT_FAILURE(vrc))
+            int irc = RTPathAbs(Filename, szFilenameAbs, sizeof(szFilenameAbs));
+            if (RT_FAILURE(irc))
             {
                 RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Filename);
@@ -1455 +1455 @@
         {
             char szFilenameAbs[RTPATH_MAX] = "";
-            int vrc = RTPathAbs(Filename, szFilenameAbs, sizeof(szFilenameAbs));
-            if (RT_FAILURE(vrc))
+            int irc = RTPathAbs(Filename, szFilenameAbs, sizeof(szFilenameAbs));
+            if (RT_FAILURE(irc))
             {
                 RTPrintf("Cannot convert filename \"%s\" to absolute path\n", Filename);

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

@@ -107 +107 @@
 };
 
-int handleImportAppliance(HandlerArg *a)
+int handleImportAppliance(HandlerArg *arg)
 {
     HRESULT rc = S_OK;
@@ -125 +125 @@
     RTGETOPTSTATE GetState;
     // start at 0 because main() has hacked both the argc and argv given to us
-    RTGetOptInit(&GetState, a->argc, a->argv, g_aImportApplianceOptions, RT_ELEMENTS(g_aImportApplianceOptions), 0, 0 /* fFlags */);
+    RTGetOptInit(&GetState, arg->argc, arg->argv, g_aImportApplianceOptions, RT_ELEMENTS(g_aImportApplianceOptions), 0, 0 /* fFlags */);
     while ((c = RTGetOpt(&GetState, &ValueUnion)))
     {
@@ -231 +231 @@
     {
         ComPtr<IAppliance> pAppliance;
-        CHECK_ERROR_BREAK(a->virtualBox, CreateAppliance(pAppliance.asOutParam()));
+        CHECK_ERROR_BREAK(arg->virtualBox, CreateAppliance(pAppliance.asOutParam()));
 
         char *pszAbsFilePath;
@@ -879 +879 @@
                         void *pvFile;
                         size_t cbFile;
-                        int rc = RTFileReadAll(itD->second.c_str(), &pvFile, &cbFile);
-                        if (RT_SUCCESS(rc))
+                        int irc = RTFileReadAll(itD->second.c_str(), &pvFile, &cbFile);
+                        if (RT_SUCCESS(irc))
                         {
-                            Bstr strContent((char*)pvFile);
-                            pVSD->AddDescription (VirtualSystemDescriptionType_License, strContent, strContent);
+                            Bstr bstrContent((char*)pvFile);
+                            pVSD->AddDescription(VirtualSystemDescriptionType_License, bstrContent, bstrContent);
                             RTFileReadAllFree(pvFile, cbFile);
                         }