Changeset 38469 in vbox for trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

Timestamp:

Aug 16, 2011 10:34:32 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73520

Message:

VD: Interface cleanup. Merge the two involved structures (generic interface descriptor and callback table) into one, remove the duplicated interface wrappers in the backends and move the interface definitions into separate headers separating public and private interfaces.

File:

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

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

@@ -870 +870 @@
     HRESULT rc = S_OK;
 
-    PVDINTERFACEIO pSha1Callbacks = 0;
-    PVDINTERFACEIO pTarCallbacks = 0;
+    PVDINTERFACEIO pSha1Io = 0;
+    PVDINTERFACEIO pTarIo = 0;
     char *pszFilename = 0;
     do
@@ -881 +881 @@
             break;
         }
-        pSha1Callbacks = Sha1CreateInterface();
-        if (!pSha1Callbacks)
+        pSha1Io = Sha1CreateInterface();
+        if (!pSha1Io)
         {
             rc = E_OUTOFMEMORY;
             break;
         }
-        pTarCallbacks = TarCreateInterface();
-        if (!pTarCallbacks)
+        pTarIo = TarCreateInterface();
+        if (!pTarIo)
         {
             rc = E_OUTOFMEMORY;
             break;
         }
-        VDINTERFACE VDInterfaceIO;
         SHA1STORAGE storage;
         RT_ZERO(storage);
-        vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IOTar",
-                             VDINTERFACETYPE_IO, pTarCallbacks,
-                             tar, &storage.pVDImageIfaces);
+        vrc = VDInterfaceAdd(&pTarIo->Core, "Appliance::IOTar",
+                             VDINTERFACETYPE_IO, tar, sizeof(VDINTERFACEIO),
+                             &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
         {
@@ -904 +903 @@
             break;
         }
-        rc = readFSImpl(pTask, pszFilename, pSha1Callbacks, &storage);
+        rc = readFSImpl(pTask, pszFilename, pSha1Io, &storage);
     }while(0);
 
@@ -912 +911 @@
     if (pszFilename)
         RTMemFree(pszFilename);
-    if (pSha1Callbacks)
-        RTMemFree(pSha1Callbacks);
-    if (pTarCallbacks)
-        RTMemFree(pTarCallbacks);
+    if (pSha1Io)
+        RTMemFree(pSha1Io);
+    if (pTarIo)
+        RTMemFree(pTarIo);
 
     LogFlowFunc(("rc=%Rhrc\n", rc));
@@ -923 +922 @@
 }
 
-HRESULT Appliance::readFSImpl(TaskOVF *pTask, const RTCString &strFilename, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage)
+HRESULT Appliance::readFSImpl(TaskOVF *pTask, const RTCString &strFilename, PVDINTERFACEIO pIfIo, PSHA1STORAGE pStorage)
 {
     LogFlowFuncEnter();
@@ -936 +935 @@
         /* Read the OVF into a memory buffer */
         size_t cbSize = 0;
-        int vrc = Sha1ReadBuf(strFilename.c_str(), &pvTmpBuf, &cbSize, pCallbacks, pStorage);
+        int vrc = Sha1ReadBuf(strFilename.c_str(), &pvTmpBuf, &cbSize, pIfIo, pStorage);
         if (   RT_FAILURE(vrc)
             || !pvTmpBuf)
@@ -1307 +1306 @@
     HRESULT rc = S_OK;
 
-    PVDINTERFACEIO pSha1Callbacks = 0;
-    PVDINTERFACEIO pTarCallbacks = 0;
+    PVDINTERFACEIO pSha1Io = 0;
+    PVDINTERFACEIO pTarIo = 0;
     char *pszFilename = 0;
     void *pvMfBuf = 0;
@@ -1315 +1314 @@
     {
         /* Create the necessary file access interfaces. */
-        pSha1Callbacks = Sha1CreateInterface();
-        if (!pSha1Callbacks)
+        pSha1Io = Sha1CreateInterface();
+        if (!pSha1Io)
             throw E_OUTOFMEMORY;
-        pTarCallbacks = TarCreateInterface();
-        if (!pTarCallbacks)
+        pTarIo = TarCreateInterface();
+        if (!pTarIo)
             throw E_OUTOFMEMORY;
 
-        VDINTERFACE VDInterfaceIO;
         SHA1STORAGE storage;
         RT_ZERO(storage);
-        vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IOTar",
-                             VDINTERFACETYPE_IO, pTarCallbacks,
-                             tar, &storage.pVDImageIfaces);
+        vrc = VDInterfaceAdd(&pTarIo->Core, "Appliance::IOTar",
+                             VDINTERFACETYPE_IO, tar, sizeof(VDINTERFACEIO),
+                             &storage.pVDImageIfaces);
         if (RT_FAILURE(vrc))
             throw setError(E_FAIL,
@@ -1345 +1343 @@
                            tr("Internal error (%Rrc)"), vrc);
 
-        PVDINTERFACEIO pCallbacks = pSha1Callbacks;
+        PVDINTERFACEIO pCallbacks = pSha1Io;
         PSHA1STORAGE pStorage = &storage;
 
@@ -1400 +1398 @@
     if (pvMfBuf)
         RTMemFree(pvMfBuf);
-    if (pSha1Callbacks)
-        RTMemFree(pSha1Callbacks);
-    if (pTarCallbacks)
-        RTMemFree(pTarCallbacks);
+    if (pSha1Io)
+        RTMemFree(pSha1Io);
+    if (pTarIo)
+        RTMemFree(pTarIo);
 
     LogFlowFunc(("rc=%Rhrc\n", rc));