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

Timestamp:

Aug 18, 2011 12:27:51 PM (13 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImplExport.cpp (modified) (3 diffs)
• ApplianceImplImport.cpp (modified) (2 diffs)

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

@@ -1621 +1621 @@
     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;
@@ -1641 +1641 @@
         RT_ZERO(storage);
         storage.fCreateDigest = m->fManifest;
-        VDINTERFACE VDInterfaceIO;
-        int vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IOFile",
-                                 VDINTERFACETYPE_IO, pFileCallbacks,
-                                 0, &storage.pVDImageIfaces);
+        int vrc = VDInterfaceAdd(&pFileIo->Core, "Appliance::IOFile",
+                                 VDINTERFACETYPE_IO, 0, sizeof(VDINTERFACEIO),
+                                 &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
         {
@@ -1650 +1649 @@
             break;
         }
-        rc = writeFSImpl(pTask, writeLock, pSha1Callbacks, &storage);
+        rc = writeFSImpl(pTask, writeLock, pSha1Io, &storage);
     }while(0);
 
     /* Cleanup */
-    if (pSha1Callbacks)
-        RTMemFree(pSha1Callbacks);
-    if (pFileCallbacks)
-        RTMemFree(pFileCallbacks);
+    if (pSha1Io)
+        RTMemFree(pSha1Io);
+    if (pFileIo)
+        RTMemFree(pFileIo);
 
     LogFlowFuncLeave();

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

@@ -833 +833 @@
         RT_ZERO(storage);
         int vrc = VDInterfaceAdd(&pFileIo->Core, "Appliance::IOFile",
-                                 VDINTERFACETYPE_IO, pFileIo, sizeof(VDINTERFACEIO),
+                                 VDINTERFACETYPE_IO, 0, sizeof(VDINTERFACEIO),
                                  &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
@@ -1247 +1247 @@
         storage.fCreateDigest = true;
         int vrc = VDInterfaceAdd(&pFileIo->Core, "Appliance::IOFile",
-                                 VDINTERFACETYPE_IO, pFileIo, sizeof(VDINTERFACEIO),
+                                 VDINTERFACETYPE_IO, 0, sizeof(VDINTERFACEIO),
                                  &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))