Changeset 27900 in vbox

Timestamp:

Mar 31, 2010 2:07:18 PM (15 years ago)

Author:

vboxsync

Message:

Main/OVF: move another method

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ApplianceImplImport.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -420 +420 @@
 }
 
-/**
- * Public method implementation.
- * @param path
- * @return
- */
-STDMETHODIMP Appliance::Read(IN_BSTR path, IProgress **aProgress)
-{
-    if (!path) return E_POINTER;
-    CheckComArgOutPointerValid(aProgress);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (!isApplianceIdle())
-        return E_ACCESSDENIED;
-
-    if (m->pReader)
-    {
-        delete m->pReader;
-        m->pReader = NULL;
-    }
-
-    // see if we can handle this file; for now we insist it has an ".ovf" extension
-    Utf8Str strPath (path);
-    if (!strPath.endsWith(".ovf", Utf8Str::CaseInsensitive))
-        return setError(VBOX_E_FILE_ERROR,
-                        tr("Appliance file must have .ovf extension"));
-
-    ComObjPtr<Progress> progress;
-    HRESULT rc = S_OK;
-    try
-    {
-        /* Parse all necessary info out of the URI */
-        parseURI(strPath, m->locInfo);
-        rc = readImpl(m->locInfo, progress);
-    }
-    catch (HRESULT aRC)
-    {
-        rc = aRC;
-    }
-
-    if (SUCCEEDED(rc))
-        /* Return progress to the caller */
-        progress.queryInterfaceTo(aProgress);
-
-    return S_OK;
-}
-
 STDMETHODIMP Appliance::CreateVFSExplorer(IN_BSTR aURI, IVFSExplorer **aExplorer)
 {

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -50 +50 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Public method implementation.
+ * @param path
+ * @return
+ */
+STDMETHODIMP Appliance::Read(IN_BSTR path, IProgress **aProgress)
+{
+    if (!path) return E_POINTER;
+    CheckComArgOutPointerValid(aProgress);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (!isApplianceIdle())
+        return E_ACCESSDENIED;
+
+    if (m->pReader)
+    {
+        delete m->pReader;
+        m->pReader = NULL;
+    }
+
+    // see if we can handle this file; for now we insist it has an ".ovf" extension
+    Utf8Str strPath (path);
+    if (!strPath.endsWith(".ovf", Utf8Str::CaseInsensitive))
+        return setError(VBOX_E_FILE_ERROR,
+                        tr("Appliance file must have .ovf extension"));
+
+    ComObjPtr<Progress> progress;
+    HRESULT rc = S_OK;
+    try
+    {
+        /* Parse all necessary info out of the URI */
+        parseURI(strPath, m->locInfo);
+        rc = readImpl(m->locInfo, progress);
+    }
+    catch (HRESULT aRC)
+    {
+        rc = aRC;
+    }
+
+    if (SUCCEEDED(rc))
+        /* Return progress to the caller */
+        progress.queryInterfaceTo(aProgress);
+
+    return S_OK;
+}
 
 /**