Index: /trunk/src/VBox/Main/ApplianceImplExport.cpp =================================================================== --- /trunk/src/VBox/Main/ApplianceImplExport.cpp (revision 33650) +++ /trunk/src/VBox/Main/ApplianceImplExport.cpp (revision 33651) @@ -1613,10 +1613,10 @@ HRESULT rc = S_OK; - PVDINTERFACEIO pSha1Callbacks = 0; + PVDINTERFACEIO pRTSha1Callbacks = 0; PVDINTERFACEIO pRTFileCallbacks = 0; do { - pSha1Callbacks = Sha1CreateInterface(); - if (!pSha1Callbacks) + pRTSha1Callbacks = RTSha1CreateInterface(); + if (!pRTSha1Callbacks) { rc = E_OUTOFMEMORY; @@ -1630,5 +1630,5 @@ } - SHA1STORAGE storage; + RTSHA1STORAGE storage; RT_ZERO(storage); storage.fCreateDigest = m->fManifest; @@ -1642,10 +1642,10 @@ break; } - rc = writeFSImpl(pTask, writeLock, pSha1Callbacks, &storage); + rc = writeFSImpl(pTask, writeLock, pRTSha1Callbacks, &storage); }while(0); /* Cleanup */ - if (pSha1Callbacks) - RTMemFree(pSha1Callbacks); + if (pRTSha1Callbacks) + RTMemFree(pRTSha1Callbacks); if (pRTFileCallbacks) RTMemFree(pRTFileCallbacks); @@ -1668,10 +1668,10 @@ HRESULT rc = S_OK; - PVDINTERFACEIO pSha1Callbacks = 0; + PVDINTERFACEIO pRTSha1Callbacks = 0; PVDINTERFACEIO pRTTarCallbacks = 0; do { - pSha1Callbacks = Sha1CreateInterface(); - if (!pSha1Callbacks) + pRTSha1Callbacks = RTSha1CreateInterface(); + if (!pRTSha1Callbacks) { rc = E_OUTOFMEMORY; @@ -1685,5 +1685,5 @@ } VDINTERFACE VDInterfaceIO; - SHA1STORAGE storage; + RTSHA1STORAGE storage; RT_ZERO(storage); storage.fCreateDigest = m->fManifest; @@ -1696,5 +1696,5 @@ break; } - rc = writeFSImpl(pTask, writeLock, pSha1Callbacks, &storage); + rc = writeFSImpl(pTask, writeLock, pRTSha1Callbacks, &storage); }while(0); @@ -1702,6 +1702,6 @@ /* Cleanup */ - if (pSha1Callbacks) - RTMemFree(pSha1Callbacks); + if (pRTSha1Callbacks) + RTMemFree(pRTSha1Callbacks); if (pRTTarCallbacks) RTMemFree(pRTTarCallbacks); @@ -1715,5 +1715,5 @@ } -HRESULT Appliance::writeFSImpl(TaskOVF *pTask, AutoWriteLockBase& writeLock, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage) +HRESULT Appliance::writeFSImpl(TaskOVF *pTask, AutoWriteLockBase& writeLock, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage) { LogFlowFuncEnter(); @@ -1747,5 +1747,5 @@ strOvfFile.c_str()); /* Write the ovf file to disk. */ - vrc = Sha1WriteBuf(strOvfFile.c_str(), pvBuf, cbSize, pCallbacks, pStorage); + vrc = RTSha1WriteBuf(strOvfFile.c_str(), pvBuf, cbSize, pCallbacks, pStorage); RTMemFree(pvBuf); if (RT_FAILURE(vrc)) @@ -1865,5 +1865,5 @@ pStorage->fCreateDigest = false; /* Write the manifest file to disk. */ - vrc = Sha1WriteBuf(strMfFilePath.c_str(), pvBuf, cbSize, pCallbacks, pStorage); + vrc = RTSha1WriteBuf(strMfFilePath.c_str(), pvBuf, cbSize, pCallbacks, pStorage); RTMemFree(pvBuf); if (RT_FAILURE(vrc)) Index: /trunk/src/VBox/Main/ApplianceImplIO.cpp =================================================================== --- /trunk/src/VBox/Main/ApplianceImplIO.cpp (revision 33650) +++ /trunk/src/VBox/Main/ApplianceImplIO.cpp (revision 33651) @@ -53,5 +53,5 @@ } RTTARSTORAGEINTERNAL, *PRTTARSTORAGEINTERNAL; -typedef struct SHA1STORAGEINTERNAL +typedef struct RTSHA1STORAGEINTERNAL { /** Completion callback. */ @@ -62,5 +62,5 @@ uint32_t fOpenMode; /** Our own storage handle. */ - PSHA1STORAGE pSha1Storage; + PRTSHA1STORAGE pSha1Storage; /** Circular buffer used for transferring data from/to the worker thread. */ PRTCIRCBUF pCircBuf; @@ -77,5 +77,5 @@ /** Event for signaling a finished task of the worker thread. */ RTSEMEVENT workFinishedEvent; - /** SHA1 calculation context. */ + /** rtSha1 calculation context. */ RTSHA1CONTEXT ctx; /** Write mode only: Memory buffer for writing zeros. */ @@ -87,5 +87,5 @@ // uint64_t calls; // uint64_t waits; -} SHA1STORAGEINTERNAL, *PSHA1STORAGEINTERNAL; +} RTSHA1STORAGEINTERNAL, *PRTSHA1STORAGEINTERNAL; /****************************************************************************** @@ -456,13 +456,13 @@ /****************************************************************************** - * Internal: Sha1 interface + * Internal: RTSha1 interface ******************************************************************************/ -DECLCALLBACK(int) sha1CalcWorkerThread(RTTHREAD /* aThread */, void *pvUser) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)pvUser; +DECLCALLBACK(int) rtSha1CalcWorkerThread(RTTHREAD /* aThread */, void *pvUser) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pInt->pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); @@ -624,5 +624,5 @@ } -DECLINLINE(int) sha1SignalManifestThread(PSHA1STORAGEINTERNAL pInt, uint32_t uStatus) +DECLINLINE(int) rtSha1SignalManifestThread(PRTSHA1STORAGEINTERNAL pInt, uint32_t uStatus) { ASMAtomicWriteU32(&pInt->u32Status, uStatus); @@ -630,5 +630,5 @@ } -DECLINLINE(int) sha1WaitForManifestThreadFinished(PSHA1STORAGEINTERNAL pInt) +DECLINLINE(int) rtSha1WaitForManifestThreadFinished(PRTSHA1STORAGEINTERNAL pInt) { // RTPrintf("start\n"); @@ -647,5 +647,5 @@ } -DECLINLINE(int) sha1FlushCurBuf(PSHA1STORAGEINTERNAL pInt) +DECLINLINE(int) rtSha1FlushCurBuf(PRTSHA1STORAGEINTERNAL pInt) { int rc = VINF_SUCCESS; @@ -653,10 +653,10 @@ { /* Let the write worker thread start immediately. */ - rc = sha1SignalManifestThread(pInt, STATUS_WRITE); + rc = rtSha1SignalManifestThread(pInt, STATUS_WRITE); if (RT_FAILURE(rc)) return rc; /* Wait until the write worker thread has finished. */ - rc = sha1WaitForManifestThreadFinished(pInt); + rc = rtSha1WaitForManifestThreadFinished(pInt); } @@ -664,6 +664,6 @@ } -static int sha1OpenCallback(void *pvUser, const char *pszLocation, uint32_t fOpen, - PFNVDCOMPLETED pfnCompleted, void **ppInt) +static int rtSha1OpenCallback(void *pvUser, const char *pszLocation, uint32_t fOpen, + PFNVDCOMPLETED pfnCompleted, void **ppInt) { /* Validate input. */ @@ -674,5 +674,5 @@ AssertReturn((fOpen & RTFILE_O_READWRITE) != RTFILE_O_READWRITE, VERR_INVALID_PARAMETER); /* No read/write allowed */ - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -682,5 +682,5 @@ DEBUG_PRINT_FLOW(); - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)RTMemAllocZ(sizeof(SHA1STORAGEINTERNAL)); + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)RTMemAllocZ(sizeof(RTSHA1STORAGEINTERNAL)); if (!pInt) return VERR_NO_MEMORY; @@ -724,10 +724,10 @@ break; /* Create the worker thread. */ - rc = RTThreadCreate(&pInt->pWorkerThread, sha1CalcWorkerThread, pInt, 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, RTTHREADFLAGS_WAITABLE, "SHA1-Worker"); + rc = RTThreadCreate(&pInt->pWorkerThread, rtSha1CalcWorkerThread, pInt, 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, RTTHREADFLAGS_WAITABLE, "SHA1-Worker"); if (RT_FAILURE(rc)) break; if (pSha1Storage->fCreateDigest) - /* Create a sha1 context the worker thread will work with. */ + /* Create a SHA1 context the worker thread will work with. */ RTSha1Init(&pInt->ctx); @@ -742,5 +742,5 @@ { /* Immediately let the worker thread start the reading. */ - rc = sha1SignalManifestThread(pInt, STATUS_READ); + rc = rtSha1SignalManifestThread(pInt, STATUS_READ); } } @@ -751,5 +751,5 @@ if (pInt->pWorkerThread) { - sha1SignalManifestThread(pInt, STATUS_END); + rtSha1SignalManifestThread(pInt, STATUS_END); RTThreadWait(pInt->pWorkerThread, RT_INDEFINITE_WAIT, 0); } @@ -770,11 +770,11 @@ } -static int sha1CloseCallback(void *pvUser, void *pvStorage) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1CloseCallback(void *pvUser, void *pvStorage) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -782,5 +782,5 @@ AssertPtrReturn(pCallbacks, VERR_INVALID_PARAMETER); - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)pvStorage; + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)pvStorage; DEBUG_PRINT_FLOW(); @@ -789,10 +789,10 @@ /* Make sure all pending writes are flushed */ - rc = sha1FlushCurBuf(pInt); + rc = rtSha1FlushCurBuf(pInt); if (pInt->pWorkerThread) { /* Signal the worker thread to end himself */ - rc = sha1SignalManifestThread(pInt, STATUS_END); + rc = rtSha1SignalManifestThread(pInt, STATUS_END); /* Worker thread stopped? */ rc = RTThreadWait(pInt->pWorkerThread, RT_INDEFINITE_WAIT, 0); @@ -835,10 +835,10 @@ } -static int sha1DeleteCallback(void *pvUser, const char *pcszFilename) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1DeleteCallback(void *pvUser, const char *pcszFilename) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -851,10 +851,10 @@ } -static int sha1MoveCallback(void *pvUser, const char *pcszSrc, const char *pcszDst, unsigned fMove) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1MoveCallback(void *pvUser, const char *pcszSrc, const char *pcszDst, unsigned fMove) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -867,10 +867,10 @@ } -static int sha1GetFreeSpaceCallback(void *pvUser, const char *pcszFilename, int64_t *pcbFreeSpace) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1GetFreeSpaceCallback(void *pvUser, const char *pcszFilename, int64_t *pcbFreeSpace) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -883,10 +883,10 @@ } -static int sha1GetModificationTimeCallback(void *pvUser, const char *pcszFilename, PRTTIMESPEC pModificationTime) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1GetModificationTimeCallback(void *pvUser, const char *pcszFilename, PRTTIMESPEC pModificationTime) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -900,11 +900,11 @@ -static int sha1GetSizeCallback(void *pvUser, void *pvStorage, uint64_t *pcbSize) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1GetSizeCallback(void *pvUser, void *pvStorage, uint64_t *pcbSize) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -912,5 +912,5 @@ AssertPtrReturn(pCallbacks, VERR_INVALID_PARAMETER); - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)pvStorage; + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)pvStorage; DEBUG_PRINT_FLOW(); @@ -926,11 +926,11 @@ } -static int sha1SetSizeCallback(void *pvUser, void *pvStorage, uint64_t cbSize) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1SetSizeCallback(void *pvUser, void *pvStorage, uint64_t cbSize) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -938,5 +938,5 @@ AssertPtrReturn(pCallbacks, VERR_INVALID_PARAMETER); - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)pvStorage; + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)pvStorage; DEBUG_PRINT_FLOW(); @@ -945,5 +945,5 @@ } -static int sha1WriteSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset, +static int rtSha1WriteSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset, const void *pvBuf, size_t cbWrite, size_t *pcbWritten) { @@ -952,5 +952,5 @@ AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -958,5 +958,5 @@ AssertPtrReturn(pCallbacks, VERR_INVALID_PARAMETER); - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)pvStorage; + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)pvStorage; DEBUG_PRINT_FLOW(); @@ -980,6 +980,6 @@ size_t cbToWrite = RT_MIN(pInt->cbZeroBuf, cbSize - cbAllWritten); size_t cbWritten = 0; - rc = sha1WriteSyncCallback(pvUser, pvStorage, pInt->cbCurAll, - pInt->pvZeroBuf, cbToWrite, &cbWritten); + rc = rtSha1WriteSyncCallback(pvUser, pvStorage, pInt->cbCurAll, + pInt->pvZeroBuf, cbToWrite, &cbWritten); if (RT_FAILURE(rc)) break; @@ -1005,5 +1005,5 @@ if ((cbWrite - cbAllWritten) > cbAvail) { - rc = sha1SignalManifestThread(pInt, STATUS_WRITE); + rc = rtSha1SignalManifestThread(pInt, STATUS_WRITE); if(RT_FAILURE(rc)) break; @@ -1011,5 +1011,5 @@ if (cbAvail == 0) { - rc = sha1WaitForManifestThreadFinished(pInt); + rc = rtSha1WaitForManifestThreadFinished(pInt); if (RT_FAILURE(rc)) break; @@ -1037,17 +1037,17 @@ if ( RT_SUCCESS(rc) && RTCircBufUsed(pInt->pCircBuf) >= (RTCircBufSize(pInt->pCircBuf) / 2)) - rc = sha1SignalManifestThread(pInt, STATUS_WRITE); + rc = rtSha1SignalManifestThread(pInt, STATUS_WRITE); return rc; } -static int sha1ReadSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset, - void *pvBuf, size_t cbRead, size_t *pcbRead) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1ReadSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset, + void *pvBuf, size_t cbRead, size_t *pcbRead) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -1057,5 +1057,5 @@ // DEBUG_PRINT_FLOW(); - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)pvStorage; + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)pvStorage; int rc = VINF_SUCCESS; @@ -1068,5 +1068,5 @@ if (pInt->cbCurAll < uOffset) { - rc = sha1ReadSyncCallback(pvUser, pvStorage, pInt->cbCurAll, 0, uOffset - pInt->cbCurAll, 0); + rc = rtSha1ReadSyncCallback(pvUser, pvStorage, pInt->cbCurAll, 0, uOffset - pInt->cbCurAll, 0); if (RT_FAILURE(rc)) return rc; @@ -1089,5 +1089,5 @@ if ((cbRead - cbAllRead) > cbAvail) { - rc = sha1SignalManifestThread(pInt, STATUS_READ); + rc = rtSha1SignalManifestThread(pInt, STATUS_READ); if(RT_FAILURE(rc)) break; @@ -1095,5 +1095,5 @@ if (cbAvail == 0) { - rc = sha1WaitForManifestThreadFinished(pInt); + rc = rtSha1WaitForManifestThreadFinished(pInt); if (RT_FAILURE(rc)) break; @@ -1126,16 +1126,16 @@ if ( RT_SUCCESS(rc) && RTCircBufFree(pInt->pCircBuf) >= (RTCircBufSize(pInt->pCircBuf) / 2)) - rc = sha1SignalManifestThread(pInt, STATUS_READ); + rc = rtSha1SignalManifestThread(pInt, STATUS_READ); return rc; } -static int sha1FlushSyncCallback(void *pvUser, void *pvStorage) -{ - /* Validate input. */ - AssertPtrReturn(pvUser, VERR_INVALID_POINTER); - AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); - - PSHA1STORAGE pSha1Storage = (PSHA1STORAGE)pvUser; +static int rtSha1FlushSyncCallback(void *pvUser, void *pvStorage) +{ + /* Validate input. */ + AssertPtrReturn(pvUser, VERR_INVALID_POINTER); + AssertPtrReturn(pvStorage, VERR_INVALID_POINTER); + + PRTSHA1STORAGE pSha1Storage = (PRTSHA1STORAGE)pvUser; PVDINTERFACE pIO = VDInterfaceGet(pSha1Storage->pVDImageIfaces, VDINTERFACETYPE_IO); AssertPtrReturn(pIO, VERR_INVALID_PARAMETER); @@ -1145,8 +1145,8 @@ DEBUG_PRINT_FLOW(); - PSHA1STORAGEINTERNAL pInt = (PSHA1STORAGEINTERNAL)pvStorage; + PRTSHA1STORAGEINTERNAL pInt = (PRTSHA1STORAGEINTERNAL)pvStorage; /* Check if there is still something in the buffer. If yes, flush it. */ - int rc = sha1FlushCurBuf(pInt); + int rc = rtSha1FlushCurBuf(pInt); if (RT_FAILURE(rc)) return rc; @@ -1159,5 +1159,5 @@ ******************************************************************************/ -PVDINTERFACEIO Sha1CreateInterface() +PVDINTERFACEIO RTSha1CreateInterface() { PVDINTERFACEIO pCallbacks = (PVDINTERFACEIO)RTMemAllocZ(sizeof(VDINTERFACEIO)); @@ -1167,15 +1167,15 @@ pCallbacks->cbSize = sizeof(VDINTERFACEIO); pCallbacks->enmInterface = VDINTERFACETYPE_IO; - pCallbacks->pfnOpen = sha1OpenCallback; - pCallbacks->pfnClose = sha1CloseCallback; - pCallbacks->pfnDelete = sha1DeleteCallback; - pCallbacks->pfnMove = sha1MoveCallback; - pCallbacks->pfnGetFreeSpace = sha1GetFreeSpaceCallback; - pCallbacks->pfnGetModificationTime = sha1GetModificationTimeCallback; - pCallbacks->pfnGetSize = sha1GetSizeCallback; - pCallbacks->pfnSetSize = sha1SetSizeCallback; - pCallbacks->pfnReadSync = sha1ReadSyncCallback; - pCallbacks->pfnWriteSync = sha1WriteSyncCallback; - pCallbacks->pfnFlushSync = sha1FlushSyncCallback; + pCallbacks->pfnOpen = rtSha1OpenCallback; + pCallbacks->pfnClose = rtSha1CloseCallback; + pCallbacks->pfnDelete = rtSha1DeleteCallback; + pCallbacks->pfnMove = rtSha1MoveCallback; + pCallbacks->pfnGetFreeSpace = rtSha1GetFreeSpaceCallback; + pCallbacks->pfnGetModificationTime = rtSha1GetModificationTimeCallback; + pCallbacks->pfnGetSize = rtSha1GetSizeCallback; + pCallbacks->pfnSetSize = rtSha1SetSizeCallback; + pCallbacks->pfnReadSync = rtSha1ReadSyncCallback; + pCallbacks->pfnWriteSync = rtSha1WriteSyncCallback; + pCallbacks->pfnFlushSync = rtSha1FlushSyncCallback; return pCallbacks; @@ -1228,5 +1228,5 @@ } -int Sha1ReadBuf(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, void *pvUser) +int RTSha1ReadBuf(const char *pcszFilename, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, void *pvUser) { /* Validate input. */ @@ -1294,5 +1294,5 @@ } -int Sha1WriteBuf(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pCallbacks, void *pvUser) +int RTSha1WriteBuf(const char *pcszFilename, void *pvBuf, size_t cbSize, PVDINTERFACEIO pCallbacks, void *pvUser) { /* Validate input. */ Index: /trunk/src/VBox/Main/ApplianceImplImport.cpp =================================================================== --- /trunk/src/VBox/Main/ApplianceImplImport.cpp (revision 33650) +++ /trunk/src/VBox/Main/ApplianceImplImport.cpp (revision 33651) @@ -707,10 +707,10 @@ HRESULT rc = S_OK; - PVDINTERFACEIO pSha1Callbacks = 0; + PVDINTERFACEIO pRTSha1Callbacks = 0; PVDINTERFACEIO pRTFileCallbacks = 0; do { - pSha1Callbacks = Sha1CreateInterface(); - if (!pSha1Callbacks) + pRTSha1Callbacks = RTSha1CreateInterface(); + if (!pRTSha1Callbacks) { rc = E_OUTOFMEMORY; @@ -724,5 +724,5 @@ } VDINTERFACE VDInterfaceIO; - SHA1STORAGE storage; + RTSHA1STORAGE storage; RT_ZERO(storage); int vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IORTFile", @@ -734,10 +734,10 @@ break; } - rc = readFSImpl(pTask, pSha1Callbacks, &storage); + rc = readFSImpl(pTask, pRTSha1Callbacks, &storage); }while(0); /* Cleanup */ - if (pSha1Callbacks) - RTMemFree(pSha1Callbacks); + if (pRTSha1Callbacks) + RTMemFree(pRTSha1Callbacks); if (pRTFileCallbacks) RTMemFree(pRTFileCallbacks); @@ -762,10 +762,10 @@ HRESULT rc = S_OK; - PVDINTERFACEIO pSha1Callbacks = 0; + PVDINTERFACEIO pRTSha1Callbacks = 0; PVDINTERFACEIO pRTTarCallbacks = 0; do { - pSha1Callbacks = Sha1CreateInterface(); - if (!pSha1Callbacks) + pRTSha1Callbacks = RTSha1CreateInterface(); + if (!pRTSha1Callbacks) { rc = E_OUTOFMEMORY; @@ -779,5 +779,5 @@ } VDINTERFACE VDInterfaceIO; - SHA1STORAGE storage; + RTSHA1STORAGE storage; RT_ZERO(storage); vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IORTTar", @@ -789,5 +789,5 @@ break; } - rc = readFSImpl(pTask, pSha1Callbacks, &storage); + rc = readFSImpl(pTask, pRTSha1Callbacks, &storage); }while(0); @@ -795,6 +795,6 @@ /* Cleanup */ - if (pSha1Callbacks) - RTMemFree(pSha1Callbacks); + if (pRTSha1Callbacks) + RTMemFree(pRTSha1Callbacks); if (pRTTarCallbacks) RTMemFree(pRTTarCallbacks); @@ -806,5 +806,5 @@ } -HRESULT Appliance::readFSImpl(TaskOVF *pTask, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage) +HRESULT Appliance::readFSImpl(TaskOVF *pTask, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage) { LogFlowFuncEnter(); @@ -820,5 +820,5 @@ /* Read the OVF into a memory buffer */ size_t cbSize = 0; - int vrc = Sha1ReadBuf(strOvfFile.c_str(), &pvTmpBuf, &cbSize, pCallbacks, pStorage); + int vrc = RTSha1ReadBuf(strOvfFile.c_str(), &pvTmpBuf, &cbSize, pCallbacks, pStorage); if (RT_FAILURE(vrc)) throw setError(VBOX_E_FILE_ERROR, @@ -1112,5 +1112,5 @@ HRESULT rc = S_OK; - PVDINTERFACEIO pSha1Callbacks = 0; + PVDINTERFACEIO pRTSha1Callbacks = 0; PVDINTERFACEIO pRTFileCallbacks = 0; void *pvMfBuf = 0; @@ -1119,6 +1119,6 @@ { /* Create the necessary file access interfaces. */ - pSha1Callbacks = Sha1CreateInterface(); - if (!pSha1Callbacks) + pRTSha1Callbacks = RTSha1CreateInterface(); + if (!pRTSha1Callbacks) throw E_OUTOFMEMORY; pRTFileCallbacks = RTFileCreateInterface(); @@ -1127,5 +1127,5 @@ VDINTERFACE VDInterfaceIO; - SHA1STORAGE storage; + RTSHA1STORAGE storage; RT_ZERO(storage); storage.fCreateDigest = true; @@ -1143,5 +1143,5 @@ storage.fCreateDigest = RTFileExists(strMfFile.c_str()); /* Now import the appliance. */ - importMachines(stack, pSha1Callbacks, &storage); + importMachines(stack, pRTSha1Callbacks, &storage); /* Read & verify the manifest file, if there is one. */ if (storage.fCreateDigest) @@ -1149,5 +1149,5 @@ /* 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, pRTSha1Callbacks, &storage); if (FAILED(rc)) throw rc; rc = verifyManifestFile(strMfFile, stack, pvMfBuf, cbMfSize); @@ -1164,6 +1164,6 @@ if (pvMfBuf) RTMemFree(pvMfBuf); - if (pSha1Callbacks) - RTMemFree(pSha1Callbacks); + if (pRTSha1Callbacks) + RTMemFree(pRTSha1Callbacks); if (pRTFileCallbacks) RTMemFree(pRTFileCallbacks); @@ -1188,5 +1188,5 @@ HRESULT rc = S_OK; - PVDINTERFACEIO pSha1Callbacks = 0; + PVDINTERFACEIO pRTSha1Callbacks = 0; PVDINTERFACEIO pRTTarCallbacks = 0; void *pvMfBuf = 0; @@ -1195,6 +1195,6 @@ { /* Create the necessary file access interfaces. */ - pSha1Callbacks = Sha1CreateInterface(); - if (!pSha1Callbacks) + pRTSha1Callbacks = RTSha1CreateInterface(); + if (!pRTSha1Callbacks) throw E_OUTOFMEMORY; pRTTarCallbacks = RTTarCreateInterface(); @@ -1203,5 +1203,5 @@ VDINTERFACE VDInterfaceIO; - SHA1STORAGE storage; + RTSHA1STORAGE storage; RT_ZERO(storage); vrc = VDInterfaceAdd(&VDInterfaceIO, "Appliance::IORTTar", @@ -1217,6 +1217,6 @@ throw E_FAIL; - PVDINTERFACEIO pCallbacks = pSha1Callbacks; - PSHA1STORAGE pStorage = &storage; + PVDINTERFACEIO pCallbacks = pRTSha1Callbacks; + PRTSHA1STORAGE pStorage = &storage; /* We always need to create the digest, cause we didn't know if there @@ -1270,6 +1270,6 @@ if (pvMfBuf) RTMemFree(pvMfBuf); - if (pSha1Callbacks) - RTMemFree(pSha1Callbacks); + if (pRTSha1Callbacks) + RTMemFree(pRTSha1Callbacks); if (pRTTarCallbacks) RTMemFree(pRTTarCallbacks); @@ -1472,5 +1472,5 @@ } -HRESULT Appliance::readManifestFile(const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage) +HRESULT Appliance::readManifestFile(const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage) { HRESULT rc = S_OK; @@ -1478,5 +1478,5 @@ bool fOldDigest = pStorage->fCreateDigest; pStorage->fCreateDigest = false; /* No digest for the manifest file */ - int vrc = Sha1ReadBuf(strFile.c_str(), ppvBuf, pcbSize, pCallbacks, pStorage); + int vrc = RTSha1ReadBuf(strFile.c_str(), ppvBuf, pcbSize, pCallbacks, pStorage); if ( RT_FAILURE(vrc) && vrc != VERR_FILE_NOT_FOUND) @@ -1489,5 +1489,5 @@ } -HRESULT Appliance::readTarManifestFile(RTTAR tar, const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage) +HRESULT Appliance::readTarManifestFile(RTTAR tar, const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PRTSHA1STORAGE pStorage) { HRESULT rc = S_OK; @@ -1663,5 +1663,5 @@ ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage) + PRTSHA1STORAGE pStorage) { ComObjPtr pProgress; @@ -1803,5 +1803,5 @@ ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage) + PRTSHA1STORAGE pStorage) { HRESULT rc; @@ -2355,5 +2355,5 @@ ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage) + PRTSHA1STORAGE pStorage) { Assert(vsdescThis->m->pConfig); @@ -2544,5 +2544,5 @@ void Appliance::importMachines(ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage) + PRTSHA1STORAGE pStorage) { HRESULT rc = S_OK; Index: /trunk/src/VBox/Main/include/ApplianceImpl.h =================================================================== --- /trunk/src/VBox/Main/include/ApplianceImpl.h (revision 33650) +++ /trunk/src/VBox/Main/include/ApplianceImpl.h (revision 33651) @@ -35,5 +35,5 @@ typedef struct VDINTERFACE *PVDINTERFACE; typedef struct VDINTERFACEIO *PVDINTERFACEIO; -typedef struct SHA1STORAGE *PSHA1STORAGE; +typedef struct RTSHA1STORAGE *PRTSHA1STORAGE; namespace ovf @@ -152,5 +152,5 @@ 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,6 +166,6 @@ 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,5 +181,5 @@ ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage); + PRTSHA1STORAGE pStorage); void importMachineGeneric(const ovf::VirtualSystem &vsysThis, ComObjPtr &vsdescThis, @@ -187,13 +187,13 @@ ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage); + PRTSHA1STORAGE pStorage); void importVBoxMachine(ComObjPtr &vsdescThis, ComPtr &pNewMachine, ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage); + PRTSHA1STORAGE pStorage); void importMachines(ImportStack &stack, PVDINTERFACEIO pCallbacks, - PSHA1STORAGE pStorage); + PRTSHA1STORAGE pStorage); /******************************************************************************* @@ -206,5 +206,5 @@ 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); Index: /trunk/src/VBox/Main/include/ApplianceImplPrivate.h =================================================================== --- /trunk/src/VBox/Main/include/ApplianceImplPrivate.h (revision 33650) +++ /trunk/src/VBox/Main/include/ApplianceImplPrivate.h (revision 33651) @@ -221,16 +221,16 @@ 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