mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XFLAIM modifications to use FTK.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@383 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-05-08 22:35:48 +00:00
parent 025fab1481
commit 0ffef299a0
122 changed files with 5397 additions and 68650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
xflaim/src/flverify.cpp
View File

@@ -1199,12 +1199,11 @@ RCODE F_DbCheck::verifyBTrees(
if (RC_BAD( rc = dbSystem.getTempDir( szTmpIoPath)))
{
if (rc == NE_XFLM_IO_PATH_NOT_FOUND ||
rc == NE_XFLM_IO_INVALID_FILENAME)
if (rc == NE_FLM_IO_PATH_NOT_FOUND ||
rc == NE_FLM_IO_INVALID_FILENAME)
{
if (RC_BAD( rc = gv_pFileSystem->pathReduce( m_pDb->m_pDatabase->m_pszDbPath,
szTmpIoPath,
szBaseName)))
if (RC_BAD( rc = gv_XFlmSysData.pFileSystem->pathReduce(
m_pDb->m_pDatabase->m_pszDbPath, szTmpIoPath, szBaseName)))
{
goto Exit;
}
@@ -4084,7 +4083,7 @@ FSTATIC FLMBYTE * getEntryEnd(
Desc: Compare two cache blocks during a sort to determine which
one has lower address.
*****************************************************************************/
FINLINE FLMINT blkSortCompare(
FINLINE FLMINT FLMAPI blkSortCompare(
void * pvBuffer,
FLMUINT uiPos1,
FLMUINT uiPos2)
@@ -4109,7 +4108,7 @@ FINLINE FLMINT blkSortCompare(
/***************************************************************************
Desc: Swap two entries in cache table during sort.
*****************************************************************************/
FINLINE void blkSortSwap(
FINLINE void FLMAPI blkSortSwap(
void * pvBuffer,
FLMUINT uiPos1,
FLMUINT uiPos2)
@@ -4408,12 +4407,12 @@ RCODE F_NodeVerifier::finalize(
FLMBOOL bSkipDOMLinkCheck,
FLMINT * piElmErrCodeRV)
{
RCODE rc = NE_XFLM_OK;
NODE_RS_ENTRY * pRSEntry = NULL;
FLMUINT uiRSBufIndex;
FLMUINT uiStorageFlags;
F_NameTable * pNameTable = pDict->getNameTable();
F_BufferIStream bufferStream;
RCODE rc = NE_XFLM_OK;
NODE_RS_ENTRY * pRSEntry = NULL;
FLMUINT uiRSBufIndex;
FLMUINT uiStorageFlags;
F_NameTable * pNameTable = pDict->getNameTable();
IF_BufferIStream * pBufferStream = NULL;
*piElmErrCodeRV = 0;
@@ -4425,13 +4424,19 @@ RCODE F_NodeVerifier::finalize(
f_memset( &m_nodeInfo, 0, sizeof( F_NODE_INFO));
if( RC_BAD( rc = bufferStream.open( m_pucBuf, m_uiBytesInBuf)))
if( RC_BAD( rc = FlmAllocBufferIStream( &pBufferStream)))
{
goto Exit;
}
if( RC_BAD( rc = pBufferStream->open(
(const char *)m_pucBuf, m_uiBytesInBuf)))
{
goto Exit;
}
if( RC_BAD( rc = flmReadNodeInfo( uiCollection, ui64NodeId,
&bufferStream, m_uiOverallLength, FALSE, &m_nodeInfo, &uiStorageFlags)))
pBufferStream, m_uiOverallLength, FALSE, &m_nodeInfo, &uiStorageFlags)))
{
goto Exit;
}
@@ -4564,6 +4569,11 @@ RCODE F_NodeVerifier::finalize(
Exit:
if( pBufferStream)
{
pBufferStream->Release();
}
if( pRSEntry)
{
f_free( &pRSEntry);