Changeset 74759 in vbox for trunk/src/VBox

Timestamp:

Oct 11, 2018 11:24:47 AM (6 years ago)

Author:

vboxsync

Message:

Main/Progress: clean up error handling and eliminate useless throwing

File:

• trunk/src/VBox/Main/src-all/ProgressImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -168 +168 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    HRESULT rc = S_OK;
-    rc = unconst(pEventSource).createObject();
-    if (FAILED(rc)) throw rc;
+    HRESULT rc = unconst(pEventSource).createObject();
+    if (FAILED(rc))
+        return rc;
 
     rc = pEventSource->init();
-    if (FAILED(rc)) throw rc;
-
-//    rc = Progress::init(
-//#if !defined(VBOX_COM_INPROC)
-//                        aParent,
-//#endif
-//                         aInitiator, aDescription, FALSE, aId);
-// NA
+    if (FAILED(rc))
+        return rc;
+
 #if !defined(VBOX_COM_INPROC)
     AssertReturn(aParent, E_INVALIDARG);
@@ -215 +210 @@
 
     unconst(mDescription) = aDescription;
-
-
-// end of assertion
-
-
-    if (FAILED(rc)) return rc;
 
     mCancelable = aCancelable;
@@ -237 +226 @@
     RTSemEventMultiReset(mCompletedSem);
 
-    /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
-        autoInitSpan.setSucceeded();
-
-    return rc;
+    /* Confirm a successful initialization. */
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
 }
 
@@ -268 +256 @@
     AutoInitSpan autoInitSpan(this);
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
-
-    HRESULT rc = S_OK;
-    /* Guarantees subclasses call this method at the proper time */
-    NOREF(autoInitSpan);
-
-    if (FAILED(rc)) return rc;
 
     mCancelable = aCancelable;
@@ -292 +274 @@
     RTSemEventMultiReset(mCompletedSem);
 
-    /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(rc))
-        autoInitSpan.setSucceeded();
-
-    return rc;
+    /* Confirm a successful initialization. */
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
 }