Required updates due to FTK API changes.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@543 0109f412-320b-0410-ab79-c3e0c5ffbbe6

xflaim/src/flbackup.cpp

@@ -1753,19 +1753,17 @@ FSTATIC RCODE flmRestoreFile(
 
 		// Unix systems can have sector sizes that are larger than our
 		// typical 4K database blocks.  The Unix implementation of SectorWrite
-		// (called by WriteBlock) will write the passed-in block and clobber any
+		// (called by writeBlock) will write the passed-in block and clobber any
 		// additional data beyond the end of the block to the end of the sector if
 		// it has enough room in the block buffer to write a full sector.  If the
 		// block buffer is less than a full sector, the Unix SectorWrite will only
 		// write out the amount requested, not a full sector.
 
 		if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
-			uiBlockSize, pucBlkBuf, uiBlockSize,
-			NULL, &uiBytesWritten)))
+			uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
 #else
 		if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
-			uiBlockSize, pucBlkBuf, uiBlkBufSize,
-			NULL, &uiBytesWritten)))
+			uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
 #endif
 		{
 			if( rc == NE_FLM_IO_PATH_NOT_FOUND ||
@@ -1786,12 +1784,10 @@ FSTATIC RCODE flmRestoreFile(
 
 #ifdef FLM_UNIX
 				if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
-					uiBlockSize, pucBlkBuf, uiBlockSize,
-					NULL, &uiBytesWritten)))
+					uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
 #else
 				if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
-					uiBlockSize, pucBlkBuf, uiBlkBufSize,
-					NULL, &uiBytesWritten)))
+					uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
 #endif
 				{
 					goto Exit;

xflaim/src/flcreate.cpp

@@ -406,8 +406,7 @@ RCODE F_Db::initDbFiles(
 		pBlkHdr->ui32BlkCRC = calcBlkCRC( pBlkHdr, SIZEOF_STD_BLK_HDR);
 		if (RC_BAD( rc = m_pSFileHdl->writeBlock(
 									(FLMUINT)pBlkHdr->ui32BlkAddr,
-									uiBlkSize, pucBuf, uiBlkSize, NULL,
-									&uiWriteBytes)))
+									uiBlkSize, pucBuf, NULL, &uiWriteBytes)))
 		{
 			goto Exit;
 		}

xflaim/src/fsuperfl.cpp

@@ -229,7 +229,6 @@ RCODE F_SuperFileHdl::writeBlock(
 	FLMUINT			uiBlkAddress,
 	FLMUINT			uiBytesToWrite,
 	const void *	pvBuffer,
-	FLMUINT			uiBufferSize,
 	IF_IOBuffer *	pIOBuffer,
 	FLMUINT *		puiBytesWritten)
 {
@@ -260,7 +259,7 @@ Get_Handle:
 	pFileHdl->setMaxAutoExtendSize( m_uiMaxAutoExtendSize);
 	if( RC_BAD( rc = pFileHdl->sectorWrite(
 		FSGetFileOffset( uiBlkAddress), uiBytesToWrite,
-		pvBuffer, uiBufferSize, pIOBuffer, puiBytesWritten)))
+		pvBuffer, pIOBuffer, puiBytesWritten)))
 	{
 		if (rc != NE_FLM_IO_DISK_FULL && rc != NE_XFLM_MEM)
 		{

xflaim/src/fsuperfl.h

@@ -70,7 +70,6 @@ public:
 		FLMUINT				uiBlkAddress,
 		FLMUINT				uiBytesToWrite,
 		const void *		pvBuffer,
-		FLMUINT				uiBufferSize,
 		IF_IOBuffer *		pIOBuffer,
 		FLMUINT *			puiBytesWritten);
 

xflaim/src/recover.cpp

@@ -249,7 +249,7 @@ RCODE F_Db::processBeforeImage(
 	m_pSFileHdl->setMaxAutoExtendSize( m_pDatabase->m_uiMaxFileSize);
 	m_pSFileHdl->setExtendSize( m_pDatabase->m_uiFileExtendSize);
 	rc = m_pSFileHdl->writeBlock( uiBlkAddress, uiBlkLength, pBlkHdr,
-						 m_pDatabase->m_uiBlockSize, NULL, &uiBytesWritten);
+						 NULL, &uiBytesWritten);
 #ifdef FLM_DBG_LOG
 	flmDbgLogWrite( m_pDatabase, uiBlkAddress, 0, ui64TransID,
 								"ROLLBACK");
@@ -360,9 +360,7 @@ RCODE F_Database::writeDbHdr(
 	}
 
 	if( RC_BAD( rc = pCFileHdl->sectorWrite( 0,
-								 uiBytesWritten, pTmpDbHdr, 
-								 pCFileHdl->getSectorSize(),
-								 NULL, &uiBytesWritten, FALSE)))
+		uiBytesWritten, pTmpDbHdr, NULL, &uiBytesWritten)))
 	{
 		if (pDbStats)
 		{

xflaim/src/rfl.cpp

@@ -839,8 +839,7 @@ RCODE F_Rfl::writeHeader(
 	// Write out the header
 
 	if (RC_BAD( rc = m_pFileHdl->sectorWrite( 0L, 512,
-										ucBuf, sizeof( ucBuf),
-										NULL, &uiBytesWritten)))
+										ucBuf, NULL, &uiBytesWritten)))
 	{
 		// Remap disk full error
 
@@ -1302,9 +1301,7 @@ RCODE F_Rfl::flush(
 		}
 
 		rc = m_pFileHdl->sectorWrite( uiFileOffset, uiBufBytes,
-						pucOldBuffer,
-						m_uiBufferSize, pAsyncBuf,
-						&uiBytesWritten, FALSE);
+						pucOldBuffer, pAsyncBuf, &uiBytesWritten);
 		if( m_uiRflWriteBufs == 1)
 		{
 

xflaim/src/scache.cpp

@@ -3804,8 +3804,7 @@ RCODE F_Database::writeContiguousBlocks(
 	// non-asynchronous write.
 
 	rc = pSFileHdl->writeBlock( uiBlkAddress, uiWriteLen,
-					pucWriteBuffer, pIOBuffer->getBufferSize(),
-					pAsyncBuffer, &uiBytesWritten);
+					pucWriteBuffer, pAsyncBuffer, &uiBytesWritten);
 	if (!pAsyncBuffer)
 	{
 		pIOBuffer->notifyComplete( rc);

xflaim/src/translog.cpp

@@ -136,13 +136,12 @@ RCODE F_Database::lgFlushLogBuffer(
 	m_pCurrLogBuffer->startTimer( pDbStats);
 
 	// NOTE: No guarantee that m_pCurrLogBuffer will still be around
-	// after the call to WriteBlock, unless we are doing
+	// after the call to writeBlock, unless we are doing
 	// non-asynchronous write.
 
 	rc = pSFileHdl->writeBlock( m_uiCurrLogBlkAddr,
 				m_uiCurrLogWriteOffset,
 				m_pCurrLogBuffer->getBuffer(),
-				m_pCurrLogBuffer->getBufferSize(),
 				pAsyncBuffer, &uiBytesWritten);
 	if (!pAsyncBuffer)
 	{