Changeset 95140 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp

Timestamp:

May 31, 2022 9:11:39 AM (3 years ago)

Author:

vboxsync

Message:

Frontends + Main: Adjust to the new rules wrt. to rc -> hrc,vrc usage. This also fixes quite a few bugs wrt shadow variables, wrong return values and output error translations / exit codes. Also see @todos added. ​​bugref:10223

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (12 diffs)

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

@@ -218 +218 @@
 RTEXITCODE handleImportAppliance(HandlerArg *arg)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     APPLIANCETYPE enmApplType = NOT_SET;
     Utf8Str strOvfFilename;
@@ -497 +497 @@
         RTStrFree(pszAbsFilePath);
 
-        rc = showProgress(progressRead);
+        hrc = showProgress(progressRead);
         CHECK_PROGRESS_ERROR_RET(progressRead, (Appliance::tr("Appliance read failed")), RTEXITCODE_FAILURE);
 
@@ -511 +511 @@
             // to tinker with the error info a bit
             RTStrmPrintf(g_pStdErr, Appliance::tr("Interpreting %ls...\n"), path.raw());
-            rc = pAppliance->Interpret();
+            hrc = pAppliance->Interpret();
             com::ErrorInfoKeeper eik;
 
@@ -528 +528 @@
 
             eik.restore();
-            if (FAILED(rc))     // during interpret, after printing warnings
+            if (FAILED(hrc))     // during interpret, after printing warnings
             {
-                com::GlueHandleComError(pAppliance, "Interpret()", rc, __FILE__, __LINE__);
+                com::GlueHandleComError(pAppliance, "Interpret()", hrc, __FILE__, __LINE__);
                 break;
             }
@@ -1394 +1394 @@
                                   ImportMachines(ComSafeArrayAsInParam(options), progress.asOutParam()));
 
-                rc = showProgress(progress);
+                hrc = showProgress(progress);
                 CHECK_PROGRESS_ERROR_RET(progress, (Appliance::tr("Appliance import failed")), RTEXITCODE_FAILURE);
 
-                if (SUCCEEDED(rc))
+                if (SUCCEEDED(hrc))
                     RTPrintf(Appliance::tr("Successfully imported the appliance.\n"));
             }
@@ -1403 +1403 @@
     } while (0);
 
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
 
@@ -1485 +1485 @@
 RTEXITCODE handleExportAppliance(HandlerArg *a)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     Utf8Str strOutputFile;
@@ -1761 +1761 @@
             }
 
-            if (FAILED(rc))
+            if (FAILED(hrc))
                 break;
         }
 
-        if (FAILED(rc))
+        if (FAILED(hrc))
             break;
 
@@ -1928 +1928 @@
         }
 
-        if (FAILED(rc))
+        if (FAILED(hrc))
             break;
 
@@ -1975 +1975 @@
         RTStrFree(pszAbsFilePath);
 
-        rc = showProgress(progress);
+        hrc = showProgress(progress);
         CHECK_PROGRESS_ERROR_RET(progress, (Appliance::tr("Appliance write failed")), RTEXITCODE_FAILURE);
 
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             RTPrintf(Appliance::tr("Successfully exported %d machine(s).\n", "", llMachines.size()), llMachines.size());
 
@@ -2039 +2039 @@
                     ComPtr<IProgress> progress1;
                     CHECK_ERROR_BREAK(oCloudClient, LaunchVM(pVSD, progress1.asOutParam()));
-                    rc = showProgress(progress1);
+                    hrc = showProgress(progress1);
                     CHECK_PROGRESS_ERROR_RET(progress1, (Appliance::tr("Creating the cloud instance failed")),
                                              RTEXITCODE_FAILURE);
 
-                    if (SUCCEEDED(rc))
+                    if (SUCCEEDED(hrc))
                     {
                         CHECK_ERROR_BREAK(pVSD, GetDescriptionByType(VirtualSystemDescriptionType_CloudInstanceId,
@@ -2062 +2062 @@
     } while (0);
 
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }