Changeset 59586 in vbox for trunk

Timestamp:

Feb 4, 2016 5:41:00 PM (9 years ago)

Author:

vboxsync

Message:

Appliance::i_readImpl: Either throw errors or return them, don't do both. duh.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -152 +152 @@
      * @{
      */
-    HRESULT i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
+    void    i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
 
     HRESULT i_readFS(TaskOVF *pTask);

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -91 +91 @@
         /* Parse all necessary info out of the URI */
         i_parseURI(aFile, m->locInfo);
-        rc = i_readImpl(m->locInfo, progress);
+        i_readImpl(m->locInfo, progress);
     }
     catch (HRESULT aRC)
@@ -845 +845 @@
  * @param   aLocInfo    The OVF location.
  * @param   aProgress   Where to return the progress object.
- * @return  COM success status code. COM error codes will be thrown.
+ * @throws  COM error codes will be thrown.
  */
-HRESULT Appliance::i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
+void Appliance::i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
 {
     BstrFmt bstrDesc = BstrFmt(tr("Reading appliance '%s'"),
@@ -872 +872 @@
 
     /* Initialize our worker task */
-    TaskOVF* task = NULL;
+    TaskOVF *task = NULL;
     try
     {
@@ -880 +880 @@
     {
         delete task;
-        throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
-                            tr("Could not create TaskOVF object for reading the OVF from disk"));
+        throw setError(VBOX_E_OBJECT_NOT_FOUND,
+                       tr("Could not create TaskOVF object for reading the OVF from disk"));
     }
 
     rc = task->createThread();
     if (FAILED(rc)) throw rc;
-
-    return rc;
 }