Changeset 38490 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 18, 2011 12:22:02 PM (13 years ago)

Author:

vboxsync

Message:

VD: fixed regression of r73520 (Interface cleanup) for ovf file import

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (7 diffs)

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

@@ -814 +814 @@
     HRESULT rc = S_OK;
 
-    PVDINTERFACEIO pSha1Callbacks = 0;
-    PVDINTERFACEIO pFileCallbacks = 0;
+    PVDINTERFACEIO pSha1Io = 0;
+    PVDINTERFACEIO pFileIo = 0;
     do
     {
-        pSha1Callbacks = Sha1CreateInterface();
-        if (!pSha1Callbacks)
+        pSha1Io = Sha1CreateInterface();
+        if (!pSha1Io)
         {
             rc = E_OUTOFMEMORY;
             break;
         }
-        pFileCallbacks = FileCreateInterface();
-        if (!pFileCallbacks)
+        pFileIo = FileCreateInterface();
+        if (!pFileIo)
         {
             rc = E_OUTOFMEMORY;
             break;
         }
-        VDINTERFACE VDInterfaceIO;
         SHA1STORAGE storage;
         RT_ZERO(storage);
-        int vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IOFile",
-                                 VDINTERFACETYPE_IO, pFileCallbacks,
-                                 0, &storage.pVDImageIfaces);
+        int vrc = VDInterfaceAdd(&pFileIo->Core, "Appliance::IOFile",
+                                 VDINTERFACETYPE_IO, pFileIo, sizeof(VDINTERFACEIO),
+                                 &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
         {
@@ -842 +841 @@
         }
 
-        rc = readFSImpl(pTask, pTask->locInfo.strPath, pSha1Callbacks, &storage);
+        rc = readFSImpl(pTask, pTask->locInfo.strPath, pSha1Io, &storage);
     }while(0);
 
     /* Cleanup */
-    if (pSha1Callbacks)
-        RTMemFree(pSha1Callbacks);
-    if (pFileCallbacks)
-        RTMemFree(pFileCallbacks);
+    if (pSha1Io)
+        RTMemFree(pSha1Io);
+    if (pFileIo)
+        RTMemFree(pFileIo);
 
     LogFlowFunc(("rc=%Rhrc\n", rc));
@@ -1230 +1229 @@
     HRESULT rc = S_OK;
 
-    PVDINTERFACEIO pSha1Callbacks = 0;
-    PVDINTERFACEIO pFileCallbacks = 0;
+    PVDINTERFACEIO pSha1Io = 0;
+    PVDINTERFACEIO pFileIo = 0;
     void *pvMfBuf = 0;
     writeLock.release();
@@ -1237 +1236 @@
     {
         /* Create the necessary file access interfaces. */
-        pSha1Callbacks = Sha1CreateInterface();
-        if (!pSha1Callbacks)
+        pSha1Io = Sha1CreateInterface();
+        if (!pSha1Io)
             throw E_OUTOFMEMORY;
-        pFileCallbacks = FileCreateInterface();
-        if (!pFileCallbacks)
+        pFileIo = FileCreateInterface();
+        if (!pFileIo)
             throw E_OUTOFMEMORY;
 
-        VDINTERFACE VDInterfaceIO;
         SHA1STORAGE storage;
         RT_ZERO(storage);
         storage.fCreateDigest = true;
-        int vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IOFile",
-                                 VDINTERFACETYPE_IO, pFileCallbacks,
-                                 0, &storage.pVDImageIfaces);
+        int vrc = VDInterfaceAdd(&pFileIo->Core, "Appliance::IOFile",
+                                 VDINTERFACETYPE_IO, pFileIo, sizeof(VDINTERFACEIO),
+                                 &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
             throw E_FAIL;
@@ -1261 +1259 @@
         storage.fCreateDigest = RTFileExists(strMfFile.c_str());
         /* Now import the appliance. */
-        importMachines(stack, pSha1Callbacks, &storage);
+        importMachines(stack, pSha1Io, &storage);
         /* Read & verify the manifest file, if there is one. */
         if (storage.fCreateDigest)
@@ -1267 +1265 @@
             /* Add the ovf file to the digest list. */
             stack.llSrcDisksDigest.push_front(STRPAIR(pTask->locInfo.strPath, m->strOVFSHA1Digest));
-            rc = readManifestFile(strMfFile, &pvMfBuf, &cbMfSize, pSha1Callbacks, &storage);
+            rc = readManifestFile(strMfFile, &pvMfBuf, &cbMfSize, pSha1Io, &storage);
             if (FAILED(rc)) throw rc;
             rc = verifyManifestFile(strMfFile, stack, pvMfBuf, cbMfSize);
@@ -1282 +1280 @@
     if (pvMfBuf)
         RTMemFree(pvMfBuf);
-    if (pSha1Callbacks)
-        RTMemFree(pSha1Callbacks);
-    if (pFileCallbacks)
-        RTMemFree(pFileCallbacks);
+    if (pSha1Io)
+        RTMemFree(pSha1Io);
+    if (pFileIo)
+        RTMemFree(pFileIo);
 
     LogFlowFunc(("rc=%Rhrc\n", rc));