Changeset 24879 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 23, 2009 4:34:12 PM (15 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: eliminate redundant code when using showProgress()

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (5 diffs)
• VBoxManage.h (modified) (1 diff)
• VBoxManageHostonly.cpp (modified) (4 diffs)
• VBoxManageSnapshot.cpp (modified) (2 diffs)

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

@@ -88 +88 @@
  * Print out progress on the console
  */
-LONG showProgress(ComPtr<IProgress> progress)
+HRESULT showProgress(ComPtr<IProgress> progress)
 {
     BOOL fCompleted;
@@ -163 +163 @@
 
     /* complete the line. */
-    LONG iRc;
+    LONG iRc = E_FAIL;
     if (SUCCEEDED(progress->COMGETTER(ResultCode)(&iRc)))
     {
@@ -616 +616 @@
             CHECK_ERROR_BREAK(console, PowerDown(progress.asOutParam()));
 
-            showProgress(progress);
-
-            LONG iRc;
-            progress->COMGETTER(ResultCode)(&iRc);
-            if (FAILED(iRc))
+            rc = showProgress(progress);
+            if (FAILED(rc))
             {
                 com::ProgressErrorInfo info(progress);
@@ -638 +635 @@
             CHECK_ERROR_BREAK(console, SaveState(progress.asOutParam()));
 
-            showProgress(progress);
-
-            LONG iRc;
-            progress->COMGETTER(ResultCode)(&iRc);
-            if (FAILED(iRc))
+            rc = showProgress(progress);
+            if (FAILED(rc))
             {
                 com::ProgressErrorInfo info(progress);
@@ -1331 +1325 @@
             ComPtr<IProgress> progress;
             CHECK_ERROR_BREAK(console, Teleport(bstrHostname, uPort, bstrPassword, uMaxDowntime, progress.asOutParam()));
-            showProgress(progress);
-
-            LONG iRc;
-            CHECK_ERROR_BREAK(progress, COMGETTER(ResultCode)(&iRc));
-            if (FAILED(iRc))
+            rc = showProgress(progress);
+            if (FAILED(rc))
             {
                 com::ProgressErrorInfo info(progress);

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -148 +148 @@
 
 #ifndef VBOX_ONLY_DOCS
-LONG showProgress(ComPtr<IProgress> progress);
+HRESULT showProgress(ComPtr<IProgress> progress);
 #endif
 

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

@@ -71 +71 @@
     CHECK_ERROR(host, CreateHostOnlyNetworkInterface (hif.asOutParam(), progress.asOutParam()));
 
-    showProgress(progress);
-
-    HRESULT hr;
-    CHECK_ERROR(progress, COMGETTER(ResultCode) (&hr));
-
+    rc = showProgress(progress);
     *pcProcessed = index - iStart;
-
-    if(FAILED(hr))
+    if (FAILED(rc))
     {
         com::ProgressErrorInfo info(progress);
@@ -84 +79 @@
             RTPrintf("Error: failed to create the host-only adapter. Error message: %lS\n", info.getText().raw());
         else
-            RTPrintf("Error: failed to create the host-only adapter. No error message available, HRESULT code: 0x%x\n", hr);
+            RTPrintf("Error: failed to create the host-only adapter. No error message available, HRESULT code: 0x%x\n", rc);
 
         return 1;
@@ -120 +115 @@
     CHECK_ERROR(host, RemoveHostOnlyNetworkInterface (guid, progress.asOutParam()));
 
-    showProgress(progress);
-
-    HRESULT hr;
-    CHECK_ERROR(progress, COMGETTER(ResultCode) (&hr));
-
+    rc = showProgress(progress);
     *pcProcessed = index - iStart;
-
-    if(FAILED(hr))
+    if (FAILED(rc))
     {
         com::ProgressErrorInfo info(progress);
@@ -133 +123 @@
             RTPrintf("Error: failed to remove the host-only adapter. Error message: %lS\n", info.getText().raw());
         else
-            RTPrintf("Error: failed to remove the host-only adapter. No error message available, HRESULT code: 0x%x\n", hr);
+            RTPrintf("Error: failed to remove the host-only adapter. No error message available, HRESULT code: 0x%x\n", rc);
 
         return 1;

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

@@ -314 +314 @@
             CHECK_ERROR_BREAK(console, TakeSnapshot(name, desc, progress.asOutParam()));
 
-            showProgress(progress);
-            LONG iRc;
-            progress->COMGETTER(ResultCode)(&iRc);
-            rc = iRc;
+            rc = showProgress(progress);
             if (FAILED(rc))
             {
@@ -378 +375 @@
             }
 
-            showProgress(pProgress);
-            LONG iRc;
-            pProgress->COMGETTER(ResultCode)(&iRc);
-            rc = iRc;
+            rc = showProgress(pProgress);
             if (FAILED(rc))
             {