Changeset 33651 in vbox for trunk/src/VBox/Main/include

Timestamp:

Nov 1, 2010 1:53:01 PM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: rename

Location:

trunk/src/VBox/Main/include

Files:

• ApplianceImpl.h (modified) (6 diffs)
• ApplianceImplPrivate.h (modified) (1 diff)

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

@@ -35 +35 @@
 typedef struct VDINTERFACE   *PVDINTERFACE;
 typedef struct VDINTERFACEIO *PVDINTERFACEIO;
-typedef struct SHA1STORAGE   *PSHA1STORAGE;
+typedef struct RTSHA1STORAGE *PRTSHA1STORAGE;
 
 namespace ovf
@@ -152 +152 @@
     HRESULT readFSOVF(TaskOVF *pTask);
     HRESULT readFSOVA(TaskOVF *pTask);
-    HRESULT readFSImpl(TaskOVF *pTask, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage);
+    HRESULT readFSImpl(TaskOVF *pTask, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage);
     HRESULT readS3(TaskOVF *pTask);
 
@@ -166 +166 @@
     HRESULT importS3(TaskOVF *pTask);
 
-    HRESULT readManifestFile(const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage);
-    HRESULT readTarManifestFile(RTTAR tar, const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage);
+    HRESULT readManifestFile(const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage);
+    HRESULT readTarManifestFile(RTTAR tar, const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage);
     HRESULT verifyManifestFile(const Utf8Str &strFile, ImportStack &stack, void *pvBuf, size_t cbSize);
 
@@ -181 +181 @@
                             ImportStack &stack,
                             PVDINTERFACEIO pCallbacks,
-                            PSHA1STORAGE pStorage);
+                            PRTSHA1STORAGE pStorage);
     void importMachineGeneric(const ovf::VirtualSystem &vsysThis,
                               ComObjPtr<VirtualSystemDescription> &vsdescThis,
@@ -187 +187 @@
                               ImportStack &stack,
                               PVDINTERFACEIO pCallbacks,
-                              PSHA1STORAGE pStorage);
+                              PRTSHA1STORAGE pStorage);
     void importVBoxMachine(ComObjPtr<VirtualSystemDescription> &vsdescThis,
                            ComPtr<IMachine> &pNewMachine,
                            ImportStack &stack,
                            PVDINTERFACEIO pCallbacks,
-                           PSHA1STORAGE pStorage);
+                           PRTSHA1STORAGE pStorage);
     void importMachines(ImportStack &stack,
                         PVDINTERFACEIO pCallbacks,
-                        PSHA1STORAGE pStorage);
+                        PRTSHA1STORAGE pStorage);
 
     /*******************************************************************************
@@ -206 +206 @@
     HRESULT writeFSOVF(TaskOVF *pTask, AutoWriteLockBase& writeLock);
     HRESULT writeFSOVA(TaskOVF *pTask, AutoWriteLockBase& writeLock);
-    HRESULT writeFSImpl(TaskOVF *pTask, AutoWriteLockBase& writeLock, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage);
+    HRESULT writeFSImpl(TaskOVF *pTask, AutoWriteLockBase& writeLock, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage);
     HRESULT writeS3(TaskOVF *pTask);
 

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

@@ -221 +221 @@
 ovf::CIMOSType_T convertVBoxOSType2CIMOSType(const char *pcszVbox);
 
-typedef struct SHA1STORAGE
+typedef struct RTSHA1STORAGE
 {
     PVDINTERFACE pVDImageIfaces;
     bool         fCreateDigest;
     Utf8Str      strDigest;
-} SHA1STORAGE, *PSHA1STORAGE;
-
-PVDINTERFACEIO Sha1CreateInterface();
+} RTSHA1STORAGE, *PRTSHA1STORAGE;
+
+PVDINTERFACEIO RTSha1CreateInterface();
 PVDINTERFACEIO RTFileCreateInterface();
 PVDINTERFACEIO RTTarCreateInterface();
-int Sha1ReadBuf(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, void *pvUser);
-int Sha1WriteBuf(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pCallbacks, void *pvUser);
+int RTSha1ReadBuf(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, void *pvUser);
+int RTSha1WriteBuf(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pCallbacks, void *pvUser);
 
 #endif // ____H_APPLIANCEIMPLPRIVATE