diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h
index 3f5cc72..ae4b2f4 100644
--- a/ftk/src/ftk.h
+++ b/ftk/src/ftk.h
@@ -337,9 +337,9 @@
/// \addtogroup retcodes
/// @{
- typedef FLMINT RCODE; ///< Return code
+ typedef FLMINT32 RCODE; ///< Return code
/// @}
- typedef FLMINT FLMBOOL;
+ typedef FLMINT32 FLMBOOL;
#define F_FILENAME_SIZE 256
#define F_PATH_MAX_SIZE 256
diff --git a/ftk/src/ftksem.cpp b/ftk/src/ftksem.cpp
index b0d3fdb..4f0ef61 100644
--- a/ftk/src/ftksem.cpp
+++ b/ftk/src/ftksem.cpp
@@ -997,7 +997,7 @@ FSTATIC void f_rwlockNotify(
*(pNotify->pRc) = NE_FLM_OK;
hSem = pNotify->hSem;
- bFoundWriter = (FLMBOOL)pNotify->pvData;
+ bFoundWriter = (FLMBOOL)((FLMINT)pNotify->pvData);
pNotify = pNotify->pNext;
f_semSignal( hSem);
}
@@ -1079,7 +1079,7 @@ RCODE FLMAPI f_rwlockAcquire(
{
if( pReadWriteLock->iRefCnt != 0)
{
- rc = f_notifyWait( pReadWriteLock->hMutex, hSem, (void *)bWriter,
+ rc = f_notifyWait( pReadWriteLock->hMutex, hSem, (void *)((FLMINT)bWriter),
&pReadWriteLock->pNotifyList);
}
@@ -1094,7 +1094,7 @@ RCODE FLMAPI f_rwlockAcquire(
{
if( pReadWriteLock->iRefCnt < 0 || pReadWriteLock->pNotifyList)
{
- rc = f_notifyWait( pReadWriteLock->hMutex, hSem, (void *)bWriter,
+ rc = f_notifyWait( pReadWriteLock->hMutex, hSem, (void *)((FLMINT)bWriter),
&pReadWriteLock->pNotifyList);
}
diff --git a/xflaim/csharp/xflaim/Backup.cpp b/xflaim/csharp/xflaim/Backup.cpp
index 924e55f..a690de1 100644
--- a/xflaim/csharp/xflaim/Backup.cpp
+++ b/xflaim/csharp/xflaim/Backup.cpp
@@ -63,7 +63,7 @@ FLMEXTC FLMEXP FLMUINT64 FLMAPI xflaim_Backup_getLastBackupTransId(
typedef RCODE (FLMAPI * BACKUP_CLIENT)(
const void * pvData,
- FLMUINT uiDataLen);
+ FLMUINT32 ui32DataLen);
/****************************************************************************
Desc:
@@ -86,7 +86,7 @@ public:
const void * pvBuffer,
FLMUINT uiBytesToWrite)
{
- return( m_fnBackupClient( pvBuffer, uiBytesToWrite));
+ return( m_fnBackupClient( pvBuffer, (FLMUINT32)uiBytesToWrite));
}
private:
@@ -134,7 +134,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_Backup_backup(
FLMUINT64 ui64This,
const char * pszBackupPath,
const char * pszPassword,
- FLMUINT * puiSeqNum,
+ FLMUINT32 * pui32SeqNum,
BACKUP_CLIENT fnBackupClient,
BACKUP_STATUS fnBackupStatus)
{
@@ -142,6 +142,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_Backup_backup(
IF_Backup * pBackup = (IF_Backup *)((FLMUINT)ui64This);
IF_BackupClient * pBackupClient = NULL;
IF_BackupStatus * pBackupStatus = NULL;
+ FLMUINT uiSeqNum;
if (fnBackupClient)
{
@@ -160,10 +161,14 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_Backup_backup(
}
}
if (RC_BAD( rc = pBackup->backup( pszBackupPath, pszPassword, pBackupClient,
- pBackupStatus, puiSeqNum)))
+ pBackupStatus, &uiSeqNum)))
{
goto Exit;
}
+ if (pui32SeqNum)
+ {
+ *pui32SeqNum = (FLMUINT32)uiSeqNum;
+ }
Exit:
diff --git a/xflaim/csharp/xflaim/DOMNode.cs b/xflaim/csharp/xflaim/DOMNode.cs
index a0e18f9..80666c0 100644
--- a/xflaim/csharp/xflaim/DOMNode.cs
+++ b/xflaim/csharp/xflaim/DOMNode.cs
@@ -32,7 +32,7 @@ namespace xflaim
///
/// DOM Node types
///
- public enum eDomNodeType
+ public enum eDomNodeType : int
{
/// Invalid Node
INVALID_NODE = 0x00,
@@ -59,7 +59,7 @@ namespace xflaim
///
/// Node insert locations - relative to another node.
///
- public enum eNodeInsertLoc
+ public enum eNodeInsertLoc : int
{
/// Insert node as root node of document
XFLM_ROOT = 0,
diff --git a/xflaim/csharp/xflaim/Db.cpp b/xflaim/csharp/xflaim/Db.cpp
index d7fa748..7492c7f 100644
--- a/xflaim/csharp/xflaim/Db.cpp
+++ b/xflaim/csharp/xflaim/Db.cpp
@@ -46,7 +46,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_Db_backupBegin(
FLMUINT64 ui64This,
FLMBOOL bFullBackup,
FLMBOOL bLockDb,
- FLMUINT uiMaxLockWait,
+ FLMUINT32 ui32MaxLockWait,
FLMUINT64 * pui64BackupRef)
{
RCODE rc = NE_XFLM_OK;
@@ -60,7 +60,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_Db_backupBegin(
(eDbTransType)(bLockDb
? XFLM_READ_TRANS
: XFLM_UPDATE_TRANS),
- uiMaxLockWait, &pBackup)))
+ (FLMUINT)ui32MaxLockWait, &pBackup)))
{
goto Exit;
}
diff --git a/xflaim/csharp/xflaim/DbInfo.cpp b/xflaim/csharp/xflaim/DbInfo.cpp
index 51a3ca3..794fd7d 100644
--- a/xflaim/csharp/xflaim/DbInfo.cpp
+++ b/xflaim/csharp/xflaim/DbInfo.cpp
@@ -42,31 +42,31 @@ FLMEXTC FLMEXP void FLMAPI xflaim_DbInfo_Release(
/****************************************************************************
Desc:
****************************************************************************/
-FLMEXTC FLMEXP FLMUINT FLMAPI xflaim_DbInfo_getNumCollections(
+FLMEXTC FLMEXP FLMUINT32 FLMAPI xflaim_DbInfo_getNumCollections(
FLMUINT64 ui64This)
{
IF_DbInfo * pDbInfo = ((IF_DbInfo *)(FLMUINT)ui64This);
- return( pDbInfo->getNumCollections());
+ return( (FLMUINT32)pDbInfo->getNumCollections());
}
/****************************************************************************
Desc:
****************************************************************************/
-FLMEXTC FLMEXP FLMUINT FLMAPI xflaim_DbInfo_getNumIndexes(
+FLMEXTC FLMEXP FLMUINT32 FLMAPI xflaim_DbInfo_getNumIndexes(
FLMUINT64 ui64This)
{
IF_DbInfo * pDbInfo = ((IF_DbInfo *)(FLMUINT)ui64This);
- return( pDbInfo->getNumIndexes());
+ return( (FLMUINT32)pDbInfo->getNumIndexes());
}
/****************************************************************************
Desc:
****************************************************************************/
-FLMEXTC FLMEXP FLMUINT FLMAPI xflaim_DbInfo_getNumLogicalFiles(
+FLMEXTC FLMEXP FLMUINT32 FLMAPI xflaim_DbInfo_getNumLogicalFiles(
FLMUINT64 ui64This)
{
IF_DbInfo * pDbInfo = ((IF_DbInfo *)(FLMUINT)ui64This);
- return( pDbInfo->getNumLogicalFiles());
+ return( (FLMUINT32)pDbInfo->getNumLogicalFiles());
}
/****************************************************************************
@@ -85,13 +85,24 @@ Desc:
FLMEXTC FLMEXP void FLMAPI xflaim_DbInfo_getAvailBlockStats(
FLMUINT64 ui64This,
FLMUINT64 * pui64BytesUsed,
- FLMUINT * puiBlockCount,
- FLMINT * piLastError,
- FLMUINT * puiNumErrors)
+ FLMUINT32 * pui32BlockCount,
+ FLMINT32 * pi32LastError,
+ FLMUINT32 * pui32NumErrors)
{
IF_DbInfo * pDbInfo = ((IF_DbInfo *)(FLMUINT)ui64This);
- pDbInfo->getAvailBlockStats( pui64BytesUsed, puiBlockCount,
- piLastError, puiNumErrors);
+ FLMUINT uiBlockCount;
+ FLMUINT uiNumErrors;
+
+ pDbInfo->getAvailBlockStats( pui64BytesUsed, &uiBlockCount,
+ pi32LastError, &uiNumErrors);
+ if (pui32BlockCount)
+ {
+ *pui32BlockCount = (FLMUINT32)uiBlockCount;
+ }
+ if (pui32NumErrors)
+ {
+ *pui32NumErrors = (FLMUINT32)uiNumErrors;
+ }
}
/****************************************************************************
@@ -100,13 +111,24 @@ Desc:
FLMEXTC FLMEXP void FLMAPI xflaim_DbInfo_getLFHBlockStats(
FLMUINT64 ui64This,
FLMUINT64 * pui64BytesUsed,
- FLMUINT * puiBlockCount,
- FLMINT * piLastError,
- FLMUINT * puiNumErrors)
+ FLMUINT32 * pui32BlockCount,
+ FLMINT32 * pi32LastError,
+ FLMUINT32 * pui32NumErrors)
{
IF_DbInfo * pDbInfo = ((IF_DbInfo *)(FLMUINT)ui64This);
- pDbInfo->getLFHBlockStats( pui64BytesUsed, puiBlockCount,
- piLastError, puiNumErrors);
+ FLMUINT uiBlockCount;
+ FLMUINT uiNumErrors;
+
+ pDbInfo->getLFHBlockStats( pui64BytesUsed, &uiBlockCount,
+ pi32LastError, &uiNumErrors);
+ if (pui32BlockCount)
+ {
+ *pui32BlockCount = (FLMUINT32)uiBlockCount;
+ }
+ if (pui32NumErrors)
+ {
+ *pui32NumErrors = (FLMUINT32)uiNumErrors;
+ }
}
@@ -115,15 +137,36 @@ Desc:
****************************************************************************/
FLMEXTC FLMEXP void FLMAPI xflaim_DbInfo_getBTreeInfo(
FLMUINT64 ui64This,
- FLMUINT uiNthLogicalFile,
- FLMUINT * puiLfNum,
- eLFileType * peLfType,
- FLMUINT * puiRootBlkAddress,
- FLMUINT * puiNumLevels)
+ FLMUINT32 ui32NthLogicalFile,
+ FLMUINT32 * pui32LfNum,
+ FLMINT32 * pi32LfType,
+ FLMUINT32 * pui32RootBlkAddress,
+ FLMUINT32 * pui32NumLevels)
{
IF_DbInfo * pDbInfo = ((IF_DbInfo *)(FLMUINT)ui64This);
- pDbInfo->getBTreeInfo( uiNthLogicalFile, puiLfNum,
- peLfType, puiRootBlkAddress, puiNumLevels);
+ FLMUINT uiLfNum;
+ eLFileType eLfType;
+ FLMUINT uiRootBlkAddress;
+ FLMUINT uiNumLevels;
+
+ pDbInfo->getBTreeInfo( (FLMUINT)ui32NthLogicalFile, &uiLfNum,
+ &eLfType, &uiRootBlkAddress, &uiNumLevels);
+ if (pui32LfNum)
+ {
+ *pui32LfNum = (FLMUINT32)uiLfNum;
+ }
+ if (pi32LfType)
+ {
+ *pi32LfType = (FLMINT32)eLfType;
+ }
+ if (pui32RootBlkAddress)
+ {
+ *pui32RootBlkAddress = (FLMUINT32)uiRootBlkAddress;
+ }
+ if (pui32NumLevels)
+ {
+ *pui32NumLevels = (FLMUINT32)uiNumLevels;
+ }
}
/****************************************************************************
@@ -131,21 +174,32 @@ Desc:
****************************************************************************/
FLMEXTC FLMEXP void FLMAPI xflaim_DbInfo_getBTreeBlockStats(
FLMUINT64 ui64This,
- FLMUINT uiNthLogicalFile,
- FLMUINT uiLevel,
+ FLMUINT32 ui32NthLogicalFile,
+ FLMUINT32 ui32Level,
FLMUINT64 * pui64KeyCount,
FLMUINT64 * pui64BytesUsed,
FLMUINT64 * pui64ElementCount,
FLMUINT64 * pui64ContElementCount,
FLMUINT64 * pui64ContElmBytes,
- FLMUINT * puiBlockCount,
- FLMINT * piLastError,
- FLMUINT * puiNumErrors)
+ FLMUINT32 * pui32BlockCount,
+ FLMINT32 * pi32LastError,
+ FLMUINT32 * pui32NumErrors)
{
IF_DbInfo * pDbInfo = ((IF_DbInfo *)(FLMUINT)ui64This);
- pDbInfo->getBTreeBlockStats( uiNthLogicalFile, uiLevel, pui64KeyCount,
+ FLMUINT uiBlockCount;
+ FLMUINT uiNumErrors;
+
+ pDbInfo->getBTreeBlockStats( (FLMUINT)ui32NthLogicalFile, (FLMUINT)ui32Level, pui64KeyCount,
pui64BytesUsed, pui64ElementCount, pui64ContElementCount, pui64ContElmBytes,
- puiBlockCount, piLastError, puiNumErrors);
+ &uiBlockCount, pi32LastError, &uiNumErrors);
+ if (pui32BlockCount)
+ {
+ *pui32BlockCount = (FLMUINT32)uiBlockCount;
+ }
+ if (pui32NumErrors)
+ {
+ *pui32NumErrors = (FLMUINT32)uiNumErrors;
+ }
}
/****************************************************************************
diff --git a/xflaim/csharp/xflaim/DbSystem.cpp b/xflaim/csharp/xflaim/DbSystem.cpp
index 7092873..3dc5e9c 100644
--- a/xflaim/csharp/xflaim/DbSystem.cpp
+++ b/xflaim/csharp/xflaim/DbSystem.cpp
@@ -107,7 +107,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_dbOpen(
IF_DbSystem * pDbSystem = (IF_DbSystem *)((FLMUINT)ui64This);
if (RC_BAD( rc = pDbSystem->dbOpen( pszDbPath, pszDataDir, pszRflDir,
- pszPassword, bAllowLimited, (IF_Db **)&pDb)))
+ pszPassword, bAllowLimited, (IF_Db **)&pDb)))
{
goto Exit;
}
@@ -145,11 +145,11 @@ typedef enum
} eRestoreClientAction;
typedef RCODE (FLMAPI * RESTORE_CLIENT)(
- eRestoreClientAction eAction,
- FLMUINT uiFileNum,
- FLMUINT uiBytesRequested,
+ FLMINT32 iAction,
+ FLMUINT32 ui32FileNum,
+ FLMUINT32 ui32BytesRequested,
void * pvBuffer,
- FLMUINT * puiBytesRead);
+ FLMUINT32 * pui32BytesRead);
/****************************************************************************
Desc:
@@ -170,19 +170,19 @@ public:
RCODE FLMAPI openBackupSet( void)
{
- return( m_fnRestoreClient( RESTORE_OPEN_BACKUP_SET, 0, 0, NULL, NULL));
+ return( m_fnRestoreClient( (FLMINT32)RESTORE_OPEN_BACKUP_SET, 0, 0, NULL, NULL));
}
RCODE FLMAPI openRflFile(
FLMUINT uiFileNum)
{
- return( m_fnRestoreClient( RESTORE_OPEN_RFL_FILE, uiFileNum, 0, NULL, NULL));
+ return( m_fnRestoreClient( (FLMINT32)RESTORE_OPEN_RFL_FILE, (FLMUINT32)uiFileNum, 0, NULL, NULL));
}
RCODE FLMAPI openIncFile(
FLMUINT uiFileNum)
{
- return( m_fnRestoreClient( RESTORE_OPEN_INC_FILE, uiFileNum, 0, NULL, NULL));
+ return( m_fnRestoreClient( (FLMINT32)RESTORE_OPEN_INC_FILE, (FLMUINT32)uiFileNum, 0, NULL, NULL));
}
RCODE FLMAPI read(
@@ -190,19 +190,28 @@ public:
void * pvBuffer,
FLMUINT * puiBytesRead)
{
- return( m_fnRestoreClient( RESTORE_READ, 0, uiBytesRequested,
- pvBuffer, puiBytesRead));
+ RCODE rc;
+ FLMUINT32 ui32BytesRead;
+
+ rc = m_fnRestoreClient( (FLMINT32)RESTORE_READ, 0, (FLMUINT32)uiBytesRequested,
+ pvBuffer, &ui32BytesRead);
+
+ if (puiBytesRead)
+ {
+ *puiBytesRead = (FLMUINT)ui32BytesRead;
+ }
+ return( rc);
}
RCODE FLMAPI close( void)
{
- return( m_fnRestoreClient( RESTORE_CLOSE, 0, 0, NULL, NULL));
+ return( m_fnRestoreClient( (FLMINT32)RESTORE_CLOSE, 0, 0, NULL, NULL));
}
RCODE FLMAPI abortFile( void)
{
- return( m_fnRestoreClient( RESTORE_ABORT_FILE, 0, 0, NULL, NULL));
+ return( m_fnRestoreClient( (FLMINT32)RESTORE_ABORT_FILE, 0, 0, NULL, NULL));
}
private:
@@ -244,16 +253,16 @@ typedef enum
} eRestoreStatusAction;
typedef RCODE (FLMAPI * RESTORE_STATUS)(
- eRestoreStatusAction eAction,
- eRestoreAction * peRestoreAction,
+ FLMINT32 iAction,
+ FLMINT32 * piRestoreAction,
FLMUINT64 ui64TransId,
FLMUINT64 ui64LongNum1,
FLMUINT64 ui64LongNum2,
FLMUINT64 ui64LongNum3,
- FLMUINT uiShortNum1,
- FLMUINT uiShortNum2,
- FLMUINT uiShortNum3,
- FLMUINT uiShortNum4);
+ FLMUINT32 ui32ShortNum1,
+ FLMUINT32 ui32ShortNum2,
+ FLMUINT32 ui32ShortNum3,
+ FLMUINT32 ui32ShortNum4);
/****************************************************************************
Desc:
@@ -277,27 +286,42 @@ public:
FLMUINT64 ui64BytesToDo,
FLMUINT64 ui64BytesDone)
{
- return( m_fnRestoreStatus( REPORT_PROGRESS, peAction, 0,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_PROGRESS, &iAction, 0,
ui64BytesToDo, ui64BytesDone, 0,
- 0, 0, 0, 0));
+ 0, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportError(
eRestoreAction * peAction,
RCODE rcErr)
{
- return( m_fnRestoreStatus( REPORT_ERROR, peAction, 0,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_ERROR, &iAction, 0,
0, 0, 0,
- (FLMUINT)rcErr, 0, 0, 0));
+ (FLMUINT32)rcErr, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportOpenRflFile(
eRestoreAction * peAction,
FLMUINT uiFileNum)
{
- return( m_fnRestoreStatus( REPORT_OPEN_RFL_FILE, peAction, 0,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_OPEN_RFL_FILE, &iAction, 0,
0, 0, 0,
- uiFileNum, 0, 0, 0));
+ (FLMUINT32)uiFileNum, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportRflRead(
@@ -305,36 +329,56 @@ public:
FLMUINT uiFileNum,
FLMUINT uiBytesRead)
{
- return( m_fnRestoreStatus( REPORT_RFL_READ, peAction, 0,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_RFL_READ, &iAction, 0,
0, 0, 0,
- uiFileNum, uiBytesRead, 0, 0));
+ (FLMUINT32)uiFileNum, (FLMUINT32)uiBytesRead, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportBeginTrans(
eRestoreAction * peAction,
FLMUINT64 ui64TransId)
{
- return( m_fnRestoreStatus( REPORT_BEGIN_TRANS, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_BEGIN_TRANS, &iAction, ui64TransId,
0, 0, 0,
- 0, 0, 0, 0));
+ 0, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportCommitTrans(
eRestoreAction * peAction,
FLMUINT64 ui64TransId)
{
- return( m_fnRestoreStatus( REPORT_COMMIT_TRANS, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_COMMIT_TRANS, &iAction, ui64TransId,
0, 0, 0,
- 0, 0, 0, 0));
+ 0, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportAbortTrans(
eRestoreAction * peAction,
FLMUINT64 ui64TransId)
{
- return( m_fnRestoreStatus( REPORT_ABORT_TRANS, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_ABORT_TRANS, &iAction, ui64TransId,
0, 0, 0,
- 0, 0, 0, 0));
+ 0, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportBlockChainFree(
@@ -345,9 +389,14 @@ public:
FLMUINT uiEndBlkAddr,
FLMUINT uiCount)
{
- return( m_fnRestoreStatus( REPORT_BLOCK_CHAIN_FREE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_BLOCK_CHAIN_FREE, &iAction, ui64TransId,
ui64MaintDocNum, 0, 0,
- uiStartBlkAddr, uiEndBlkAddr, uiCount, 0));
+ (FLMUINT32)uiStartBlkAddr, (FLMUINT32)uiEndBlkAddr, (FLMUINT32)uiCount, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportIndexSuspend(
@@ -355,9 +404,14 @@ public:
FLMUINT64 ui64TransId,
FLMUINT uiIndexNum)
{
- return( m_fnRestoreStatus( REPORT_INDEX_SUSPEND, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_INDEX_SUSPEND, &iAction, ui64TransId,
0, 0, 0,
- uiIndexNum, 0, 0, 0));
+ (FLMUINT32)uiIndexNum, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportIndexResume(
@@ -365,9 +419,14 @@ public:
FLMUINT64 ui64TransId,
FLMUINT uiIndexNum)
{
- return( m_fnRestoreStatus( REPORT_INDEX_RESUME, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_INDEX_RESUME, &iAction, ui64TransId,
0, 0, 0,
- uiIndexNum, 0, 0, 0));
+ (FLMUINT32)uiIndexNum, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportReduce(
@@ -375,9 +434,14 @@ public:
FLMUINT64 ui64TransId,
FLMUINT uiCount)
{
- return( m_fnRestoreStatus( REPORT_REDUCE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_REDUCE, &iAction, ui64TransId,
0, 0, 0,
- uiCount, 0, 0, 0));
+ (FLMUINT32)uiCount, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportUpgrade(
@@ -386,36 +450,56 @@ public:
FLMUINT uiOldDbVersion,
FLMUINT uiNewDbVersion)
{
- return( m_fnRestoreStatus( REPORT_UPGRADE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_UPGRADE, &iAction, ui64TransId,
0, 0, 0,
- uiOldDbVersion, uiNewDbVersion, 0, 0));
+ (FLMUINT32)uiOldDbVersion, (FLMUINT32)uiNewDbVersion, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportEnableEncryption(
eRestoreAction * peAction,
FLMUINT64 ui64TransId)
{
- return( m_fnRestoreStatus( REPORT_ENABLE_ENCRYPTION, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_ENABLE_ENCRYPTION, &iAction, ui64TransId,
0, 0, 0,
- 0, 0, 0, 0));
+ 0, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportWrapKey(
eRestoreAction * peAction,
FLMUINT64 ui64TransId)
{
- return( m_fnRestoreStatus( REPORT_WRAP_KEY, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_WRAP_KEY, &iAction, ui64TransId,
0, 0, 0,
- 0, 0, 0, 0));
+ 0, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportRollOverDbKey(
eRestoreAction * peAction,
FLMUINT64 ui64TransId)
{
- return( m_fnRestoreStatus( REPORT_ROLL_OVER_DB_KEY, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_ROLL_OVER_DB_KEY, &iAction, ui64TransId,
0, 0, 0,
- 0, 0, 0, 0));
+ 0, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportDocumentDone(
@@ -424,9 +508,14 @@ public:
FLMUINT uiCollection,
FLMUINT64 ui64DocumentId)
{
- return( m_fnRestoreStatus( REPORT_DOCUMENT_DONE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_DOCUMENT_DONE, &iAction, ui64TransId,
ui64DocumentId, 0, 0,
- uiCollection, 0, 0, 0));
+ (FLMUINT32)uiCollection, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeDelete(
@@ -435,9 +524,14 @@ public:
FLMUINT uiCollection,
FLMUINT64 ui64NodeId)
{
- return( m_fnRestoreStatus( REPORT_NODE_DELETE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_DELETE, &iAction, ui64TransId,
ui64NodeId, 0, 0,
- uiCollection, 0, 0, 0));
+ (FLMUINT32)uiCollection, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportAttributeDelete(
@@ -447,9 +541,14 @@ public:
FLMUINT64 ui64ElementId,
FLMUINT uiAttrNameId)
{
- return( m_fnRestoreStatus( REPORT_ATTRIBUTE_DELETE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_ATTRIBUTE_DELETE, &iAction, ui64TransId,
ui64ElementId, 0, 0,
- uiCollection, uiAttrNameId, 0, 0));
+ (FLMUINT32)uiCollection, (FLMUINT32)uiAttrNameId, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeChildrenDelete(
@@ -459,9 +558,14 @@ public:
FLMUINT64 ui64ParentNodeId,
FLMUINT uiNameId)
{
- return( m_fnRestoreStatus( REPORT_NODE_CHILDREN_DELETE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_CHILDREN_DELETE, &iAction, ui64TransId,
ui64ParentNodeId, 0, 0,
- uiCollection, uiNameId, 0, 0));
+ (FLMUINT32)uiCollection, (FLMUINT32)uiNameId, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeCreate(
@@ -473,9 +577,14 @@ public:
FLMUINT uiNameId,
eNodeInsertLoc eLocation)
{
- return( m_fnRestoreStatus( REPORT_NODE_CREATE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_CREATE, &iAction, ui64TransId,
ui64RefNodeId, 0, 0,
- uiCollection, (FLMUINT)eNodeType, uiNameId, (FLMUINT)eLocation));
+ (FLMUINT32)uiCollection, (FLMUINT32)eNodeType, (FLMUINT32)uiNameId, (FLMUINT32)eLocation);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportInsertBefore(
@@ -486,9 +595,14 @@ public:
FLMUINT64 ui64NewChildNodeId,
FLMUINT64 ui64RefChildNodeId)
{
- return( m_fnRestoreStatus( REPORT_INSERT_BEFORE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_INSERT_BEFORE, &iAction, ui64TransId,
ui64ParentNodeId, ui64NewChildNodeId, ui64RefChildNodeId,
- uiCollection, 0, 0, 0));
+ (FLMUINT32)uiCollection, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeUpdate(
@@ -497,9 +611,14 @@ public:
FLMUINT uiCollection,
FLMUINT64 ui64NodeId)
{
- return( m_fnRestoreStatus( REPORT_NODE_UPDATE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_UPDATE, &iAction, ui64TransId,
ui64NodeId, 0, 0,
- uiCollection, 0, 0, 0));
+ (FLMUINT32)uiCollection, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeSetValue(
@@ -508,9 +627,14 @@ public:
FLMUINT uiCollection,
FLMUINT64 ui64NodeId)
{
- return( m_fnRestoreStatus( REPORT_NODE_SET_VALUE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_SET_VALUE, &iAction, ui64TransId,
ui64NodeId, 0, 0,
- uiCollection, 0, 0, 0));
+ (FLMUINT32)uiCollection, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportAttributeSetValue(
@@ -520,9 +644,14 @@ public:
FLMUINT64 ui64ElementNodeId,
FLMUINT uiAttrNameId)
{
- return( m_fnRestoreStatus( REPORT_ATTRIBUTE_SET_VALUE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_ATTRIBUTE_SET_VALUE, &iAction, ui64TransId,
ui64ElementNodeId, 0, 0,
- uiCollection, uiAttrNameId, 0, 0));
+ (FLMUINT32)uiCollection, (FLMUINT32)uiAttrNameId, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeFlagsUpdate(
@@ -533,9 +662,14 @@ public:
FLMUINT uiFlags,
FLMBOOL bAdd)
{
- return( m_fnRestoreStatus( REPORT_NODE_FLAGS_UPDATE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_FLAGS_UPDATE, &iAction, ui64TransId,
ui64NodeId, 0, 0,
- uiCollection, uiFlags, (FLMUINT)bAdd, 0));
+ (FLMUINT32)uiCollection, (FLMUINT32)uiFlags, (FLMUINT32)bAdd, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeSetPrefixId(
@@ -546,9 +680,14 @@ public:
FLMUINT uiAttrNameId,
FLMUINT uiPrefixId)
{
- return( m_fnRestoreStatus( REPORT_NODE_SET_PREFIX_ID, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_SET_PREFIX_ID, &iAction, ui64TransId,
ui64NodeId, 0, 0,
- uiCollection, uiAttrNameId, uiPrefixId, 0));
+ (FLMUINT32)uiCollection, (FLMUINT32)uiAttrNameId, (FLMUINT32)uiPrefixId, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportNodeSetMetaValue(
@@ -558,9 +697,14 @@ public:
FLMUINT64 ui64NodeId,
FLMUINT64 ui64MetaValue)
{
- return( m_fnRestoreStatus( REPORT_NODE_SET_META_VALUE, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_NODE_SET_META_VALUE, &iAction, ui64TransId,
ui64NodeId, ui64MetaValue, 0,
- uiCollection, 0, 0, 0));
+ (FLMUINT32)uiCollection, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
RCODE FLMAPI reportSetNextNodeId(
@@ -569,9 +713,14 @@ public:
FLMUINT uiCollection,
FLMUINT64 ui64NextNodeId)
{
- return( m_fnRestoreStatus( REPORT_SET_NEXT_NODE_ID, peAction, ui64TransId,
+ RCODE rc;
+ FLMINT32 iAction;
+
+ rc = m_fnRestoreStatus( (FLMINT32)REPORT_SET_NEXT_NODE_ID, &iAction, ui64TransId,
ui64NextNodeId, 0, 0,
- uiCollection, 0, 0, 0));
+ (FLMUINT32)uiCollection, 0, 0, 0);
+ *peAction = (eRestoreAction)iAction;
+ return( rc);
}
@@ -688,7 +837,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_dbCheck(
const char * pszDataDir,
const char * pszRflDir,
const char * pszPassword,
- FLMUINT uiFlags,
+ FLMUINT32 ui32Flags,
DB_CHECK_STATUS fnCheckStatus,
FLMUINT64 * pui64DbInfo)
{
@@ -707,7 +856,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_dbCheck(
}
if (RC_BAD( rc = pDbSystem->dbCheck( pszDbName, pszDataDir, pszRflDir, pszPassword,
- uiFlags, &pDbInfo, pDbCheckStatus)))
+ (FLMUINT)ui32Flags, &pDbInfo, pDbCheckStatus)))
{
goto Exit;
}
@@ -1063,7 +1212,7 @@ Desc:
FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_openBufferedIStream(
FLMUINT64 ui64This,
FLMUINT64 ui64InputIStream,
- FLMUINT uiBufferSize,
+ FLMUINT32 ui32BufferSize,
FLMUINT64 * pui64IStream)
{
RCODE rc = NE_XFLM_OK;
@@ -1071,7 +1220,8 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_openBufferedIStream(
IF_IStream * pInputStream = (IF_IStream *)((FLMUINT)ui64InputIStream);
IF_IStream * pIStream = NULL;
- if (RC_BAD( rc = pDbSystem->openBufferedIStream( pInputStream, uiBufferSize, &pIStream)))
+ if (RC_BAD( rc = pDbSystem->openBufferedIStream( pInputStream,
+ (FLMUINT)ui32BufferSize, &pIStream)))
{
goto Exit;
}
@@ -1186,7 +1336,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_openMultiFileOStream(
FLMUINT64 ui64This,
const char * pszDirectory,
const char * pszBaseName,
- FLMUINT uiMaxFileSize,
+ FLMUINT32 ui32MaxFileSize,
FLMBOOL bOkToOverwrite,
FLMUINT64 * pui64OStream)
{
@@ -1195,7 +1345,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_openMultiFileOStream(
IF_OStream * pOStream = NULL;
if (RC_BAD( rc = pDbSystem->openMultiFileOStream( pszDirectory, pszBaseName,
- uiMaxFileSize, bOkToOverwrite, &pOStream)))
+ (FLMUINT)ui32MaxFileSize, bOkToOverwrite, &pOStream)))
{
goto Exit;
}
@@ -1225,7 +1375,7 @@ Desc:
FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_openBufferedOStream(
FLMUINT64 ui64This,
FLMUINT64 ui64InputOStream,
- FLMUINT uiBufferSize,
+ FLMUINT32 ui32BufferSize,
FLMUINT64 * pui64OStream)
{
RCODE rc = NE_XFLM_OK;
@@ -1234,7 +1384,7 @@ FLMEXTC FLMEXP RCODE FLMAPI xflaim_DbSystem_openBufferedOStream(
IF_OStream * pOStream = NULL;
if (RC_BAD( rc = pDbSystem->openBufferedOStream( pInputOStream,
- uiBufferSize, &pOStream)))
+ (FLMUINT)ui32BufferSize, &pOStream)))
{
goto Exit;
}
diff --git a/xflaim/csharp/xflaim/DbSystem.cs b/xflaim/csharp/xflaim/DbSystem.cs
index 200954e..ee67bfa 100644
--- a/xflaim/csharp/xflaim/DbSystem.cs
+++ b/xflaim/csharp/xflaim/DbSystem.cs
@@ -32,7 +32,7 @@ namespace xflaim
///
/// Valid database versions
///
- public enum DBVersions
+ public enum DBVersions : uint
{
/// Version 5.12
XFLM_VER_5_12 = 512,
@@ -43,7 +43,7 @@ namespace xflaim
///
/// Valid languages
///
- public enum Languages
+ public enum Languages : int
{
/// English, United States
FLM_US_LANG = 0,
@@ -129,7 +129,7 @@ namespace xflaim
/// Types of logical files. These are defined in xflaim.h. If they
/// are changed in xflaim.h, they need to be changed here as well.
///
- public enum eLFileType
+ public enum eLFileType : int
{
/// Invalid type
XFLM_LF_INVALID = 0,
@@ -572,7 +572,7 @@ namespace xflaim
RestoreStatusCallback fnRestoreStatus);
// WARNING NOTE: Any changes to this enum should also be reflected in DbSystem.cpp
- private enum RestoreClientAction
+ private enum RestoreClientAction : int
{
RESTORE_OPEN_BACKUP_SET = 1,
RESTORE_OPEN_RFL_FILE = 2,
@@ -630,7 +630,7 @@ namespace xflaim
}
// WARNING NOTE: Any changes to this enum should also be reflected in DbSystem.cpp
- private enum RestoreStatusAction
+ private enum RestoreStatusAction : int
{
REPORT_PROGRESS = 1,
REPORT_ERROR = 2,
diff --git a/xflaim/csharp/xflaim/RCODE.cs b/xflaim/csharp/xflaim/RCODE.cs
index 362d712..80e996c 100644
--- a/xflaim/csharp/xflaim/RCODE.cs
+++ b/xflaim/csharp/xflaim/RCODE.cs
@@ -32,7 +32,7 @@ namespace xflaim
///
/// Error codes returned from XFLAIM.
///
- public enum RCODE
+ public enum RCODE : int
{
///
NE_XFLM_OK = 0,
diff --git a/xflaim/csharp/xflaim/RestoreStatus.cs b/xflaim/csharp/xflaim/RestoreStatus.cs
index 26053f7..0bbc1e1 100644
--- a/xflaim/csharp/xflaim/RestoreStatus.cs
+++ b/xflaim/csharp/xflaim/RestoreStatus.cs
@@ -35,7 +35,7 @@ namespace xflaim
/// what action to take with respect to the operation that it is
/// reporting it is about to do.
///
- public enum RestoreAction
+ public enum RestoreAction : int
{
/// Continue restore
XFLM_RESTORE_ACTION_CONTINUE = 0,
diff --git a/xflaim/csharp/xflaim/dbCheck.cs b/xflaim/csharp/xflaim/dbCheck.cs
index 21da7ac..5d8e32c 100644
--- a/xflaim/csharp/xflaim/dbCheck.cs
+++ b/xflaim/csharp/xflaim/dbCheck.cs
@@ -33,7 +33,7 @@ namespace xflaim
/// Flags to be used for checking a database.
///
[Flags]
- public enum DbCheckFlags
+ public enum DbCheckFlags : int
{
/// Repair index corruptions on-line.
XFLM_ONLINE = 0x0020,
@@ -55,7 +55,7 @@ namespace xflaim
/// IMPORTANT NOTE: Any additions or changes made in the C++ code should be
/// synced to here.
///
- public enum FlmCorruptionCode
+ public enum FlmCorruptionCode : int
{
///
FLM_BAD_CHAR = 1,
@@ -266,7 +266,7 @@ namespace xflaim
/// IMPORTANT NOTE: Any additions or changes made in the C++ code should be
/// synced to here.
///
- public enum ErrLocale
+ public enum ErrLocale : int
{
///
XFLM_LOCALE_NONE = 0,
@@ -338,7 +338,7 @@ namespace xflaim
/// IMPORTANT NOTE: These enums need to stay in sync with the corresponding
/// definitions in xflaim.h
///
- public enum FlmCheckPhase
+ public enum FlmCheckPhase : int
{
/// Checking logical file header blocks.
XFLM_CHECK_LFH_BLOCKS = 1,
diff --git a/xflaim/csharp/xflaim/dbRebuild.cs b/xflaim/csharp/xflaim/dbRebuild.cs
index 6a1caf6..1e82bf4 100644
--- a/xflaim/csharp/xflaim/dbRebuild.cs
+++ b/xflaim/csharp/xflaim/dbRebuild.cs
@@ -32,7 +32,7 @@ namespace xflaim
///
/// Phases of a rebuild operation.
///
- public enum RebuildPhase
+ public enum RebuildPhase : int
{
/// Determining block size
REBUILD_GET_BLK_SIZ = 1,
diff --git a/xflaim/java/jni/jdbsystem.cpp b/xflaim/java/jni/jdbsystem.cpp
index cfdb785..11d0433 100644
--- a/xflaim/java/jni/jdbsystem.cpp
+++ b/xflaim/java/jni/jdbsystem.cpp
@@ -902,9 +902,9 @@ FSTATIC void getCreateOpts(
fid_CREATEOPTS_iMinRflFileSize);
pCreateOpts->ui32MaxRflFileSize = (FLMUINT32)pEnv->GetIntField( createOpts,
fid_CREATEOPTS_iMaxRflFileSize);
- pCreateOpts->i32KeepRflFiles = (FLMINT32)(pEnv->GetBooleanField( createOpts,
+ pCreateOpts->bKeepRflFiles = (FLMBOOL)(pEnv->GetBooleanField( createOpts,
fid_CREATEOPTS_bKeepRflFiles) ? TRUE : FALSE);
- pCreateOpts->i32LogAbortedTransToRfl = (FLMINT32)(pEnv->GetBooleanField( createOpts,
+ pCreateOpts->bLogAbortedTransToRfl = (FLMBOOL)(pEnv->GetBooleanField( createOpts,
fid_CREATEOPTS_bLogAbortedTransToRfl) ? TRUE : FALSE);
pCreateOpts->ui32DefaultLanguage = (FLMUINT32)pEnv->GetIntField( createOpts,
fid_CREATEOPTS_iDefaultLanguage);
@@ -1572,7 +1572,7 @@ public:
return( (RCODE)m_pEnv->CallIntMethod( m_jDbRebuildStatusObject,
m_jReportRebuildMethodId,
- (jint)pRebuild->iDoingFlag,
+ (jint)pRebuild->i32DoingFlag,
(jboolean)(pRebuild->bStartFlag ? JNI_TRUE : JNI_FALSE),
(jlong)pRebuild->ui64FileSize,
(jlong)pRebuild->ui64BytesExamined,
@@ -1586,14 +1586,14 @@ public:
{
return( (RCODE)m_pEnv->CallIntMethod( m_jDbRebuildStatusObject,
m_jReportRebuildErrMethodId,
- (jint)pCorruptInfo->iErrCode,
- (jint)pCorruptInfo->uiErrLocale,
- (jint)pCorruptInfo->uiErrLfNumber,
- (jint)pCorruptInfo->uiErrLfType,
- (jint)pCorruptInfo->uiErrBTreeLevel,
- (jint)pCorruptInfo->uiErrBlkAddress,
- (jint)pCorruptInfo->uiErrParentBlkAddress,
- (jint)pCorruptInfo->uiErrElmOffset,
+ (jint)pCorruptInfo->i32ErrCode,
+ (jint)pCorruptInfo->ui32ErrLocale,
+ (jint)pCorruptInfo->ui32ErrLfNumber,
+ (jint)pCorruptInfo->ui32ErrLfType,
+ (jint)pCorruptInfo->ui32ErrBTreeLevel,
+ (jint)pCorruptInfo->ui32ErrBlkAddress,
+ (jint)pCorruptInfo->ui32ErrParentBlkAddress,
+ (jint)pCorruptInfo->ui32ErrElmOffset,
(jlong)pCorruptInfo->ui64ErrNodeId));
}
diff --git a/xflaim/src/ffilehdr.cpp b/xflaim/src/ffilehdr.cpp
index 1b8194e..9ec3bee 100644
--- a/xflaim/src/ffilehdr.cpp
+++ b/xflaim/src/ffilehdr.cpp
@@ -72,11 +72,11 @@ void flmInitDbHdr(
{
pDbHdr->ui16BlockSize = (FLMUINT16)pCreateOpts->ui32BlockSize;
pDbHdr->ui8DefaultLanguage = (FLMUINT8)pCreateOpts->ui32DefaultLanguage;
- if (pCreateOpts->i32KeepRflFiles)
+ if (pCreateOpts->bKeepRflFiles)
{
pDbHdr->ui8RflKeepFiles = 1;
}
- if (pCreateOpts->i32LogAbortedTransToRfl)
+ if (pCreateOpts->bLogAbortedTransToRfl)
{
pDbHdr->ui8RflKeepAbortedTrans = 1;
}
diff --git a/xflaim/src/flaimsys.h b/xflaim/src/flaimsys.h
index 9fce9c7..8bc48f4 100644
--- a/xflaim/src/flaimsys.h
+++ b/xflaim/src/flaimsys.h
@@ -7454,7 +7454,7 @@ typedef struct
FLMUINT64 ui64ContElementCount;
FLMUINT64 ui64ContElmBytes;
FLMUINT uiBlockCount;
- FLMINT iErrCode;
+ FLMINT32 i32ErrCode;
FLMUINT uiNumErrors;
} BLOCK_INFO;
@@ -7541,7 +7541,7 @@ public:
FLMUINT uiCollection,
FLMUINT64 ui64NodeId,
FLMBOOL bSkipDOMLinkCheck,
- FLMINT * piElmErrCodeRV);
+ FLMINT32 * pi32ElmErrCodeRV);
FINLINE void setupNodeRS(
F_BtResultSet * pRS)
@@ -7563,13 +7563,13 @@ private:
eDomNodeType eNodeType,
FLMUINT uiNameId,
F_NameTable * pNameTable,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
RCODE verifyPrefixId(
F_Db * pDb,
FLMUINT uiPrefixId,
F_NameTable * pNameTable,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
RCODE checkForIndexes(
F_Db * pDb,
@@ -7703,14 +7703,14 @@ private:
}
RCODE chkReportError(
- FLMINT iErrCode,
- FLMUINT uiErrLocale,
- FLMUINT uiErrLfNumber,
- FLMUINT uiErrLfType,
- FLMUINT uiErrBTreeLevel,
- FLMUINT uiErrBlkAddress,
- FLMUINT uiErrParentBlkAddress,
- FLMUINT uiErrElmOffset,
+ FLMINT32 i32ErrCode,
+ FLMUINT32 ui32ErrLocale,
+ FLMUINT32 ui32ErrLfNumber,
+ FLMUINT32 ui32ErrLfType,
+ FLMUINT32 ui32ErrBTreeLevel,
+ FLMUINT32 ui32ErrBlkAddress,
+ FLMUINT32 ui32ErrParentBlkAddress,
+ FLMUINT32 ui32ErrElmOffset,
FLMUINT64 ui64ErrNodeId);
FINLINE XFLM_PROGRESS_CHECK_INFO * getProgress( void)
@@ -7744,7 +7744,7 @@ private:
FLMUINT uiBlkAddress,
F_BLK_HDR ** ppBlkHdr,
F_CachedBlock ** ppSCache,
- FLMINT * piBlkErrCodeRV);
+ FLMINT32 * pi32BlkErrCodeRV);
RCODE verifySubTree(
STATE_INFO * pParentState,
@@ -7770,12 +7770,12 @@ private:
RCODE verifyNodePointers(
STATE_INFO * pStateInfo,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
RCODE verifyDOChain(
STATE_INFO * pParentState,
FLMUINT uiBlkAddr,
- FLMINT * piElmErrCode);
+ FLMINT32 * pi32ElmErrCode);
RCODE chkGetNextRSKey( void);
@@ -7812,7 +7812,7 @@ private:
RCODE reportIxError(
STATE_INFO * pStateInfo,
- FLMINT iErrCode,
+ FLMINT32 i32ErrCode,
FLMBYTE * pucErrKey,
FLMUINT uiErrKeyLen,
FLMBOOL * pbFixErrRV);
@@ -8064,24 +8064,24 @@ public:
FINLINE void FLMAPI getAvailBlockStats(
FLMUINT64 * pui64BytesUsed,
FLMUINT * puiBlockCount,
- FLMINT * piLastError,
- FLMUINT * puiNumErrors)
+ FLMINT32 * pi32LastError,
+ FLMUINT * puiNumErrors)
{
*pui64BytesUsed = m_LFHBlocks.ui64BytesUsed;
*puiBlockCount = m_AvailBlocks.uiBlockCount;
- *piLastError = m_AvailBlocks.iErrCode;
+ *pi32LastError = m_AvailBlocks.i32ErrCode;
*puiNumErrors = m_AvailBlocks.uiNumErrors;
}
FINLINE void FLMAPI getLFHBlockStats(
FLMUINT64 * pui64BytesUsed,
FLMUINT * puiBlockCount,
- FLMINT * piLastError,
- FLMUINT * puiNumErrors)
+ FLMINT32 * pi32LastError,
+ FLMUINT * puiNumErrors)
{
*pui64BytesUsed = m_LFHBlocks.ui64BytesUsed;
*puiBlockCount = m_LFHBlocks.uiBlockCount;
- *piLastError = m_LFHBlocks.iErrCode;
+ *pi32LastError = m_LFHBlocks.i32ErrCode;
*puiNumErrors = m_LFHBlocks.uiNumErrors;
}
@@ -8093,7 +8093,7 @@ public:
FLMUINT * puiNumLevels);
void FLMAPI getBTreeBlockStats(
- FLMUINT uiNthLogicalFile,
+ FLMUINT uiNthLogicalFile,
FLMUINT uiLevel,
FLMUINT64 * pui64KeyCount,
FLMUINT64 * pui64BytesUsed,
@@ -8101,8 +8101,8 @@ public:
FLMUINT64 * pui64ContElementCount,
FLMUINT64 * pui64ContElmBytes,
FLMUINT * puiBlockCount,
- FLMINT * piLastError,
- FLMUINT * puiNumErrors);
+ FLMINT32 * pi32LastError,
+ FLMUINT * puiNumErrors);
private:
@@ -8322,7 +8322,7 @@ private:
FLMBYTE * pucNodeIV);
FINLINE RCODE reportCorruption(
- FLMINT iErrCode,
+ FLMINT32 i32ErrCode,
FLMUINT uiErrBlkAddress,
FLMUINT uiErrElmOffset,
FLMUINT64 ui64ErrNodeId)
@@ -8331,12 +8331,12 @@ private:
if( m_pRebuildStatus)
{
- m_corruptInfo.iErrCode = iErrCode;
- m_corruptInfo.uiErrBlkAddress = uiErrBlkAddress;
- m_corruptInfo.uiErrElmOffset = uiErrElmOffset;
+ m_corruptInfo.i32ErrCode = i32ErrCode;
+ m_corruptInfo.ui32ErrBlkAddress = (FLMUINT32)uiErrBlkAddress;
+ m_corruptInfo.ui32ErrElmOffset = (FLMUINT32)uiErrElmOffset;
m_corruptInfo.ui64ErrNodeId = ui64ErrNodeId;
rc = m_pRebuildStatus->reportRebuildErr( &m_corruptInfo);
- m_corruptInfo.iErrCode = 0;
+ m_corruptInfo.i32ErrCode = 0;
return( rc);
}
@@ -8383,7 +8383,7 @@ void flmInitReadState(
FLMUINT uiBlkType,
FLMBYTE * pucKeyBuffer);
-FLMINT flmVerifyBlockHeader(
+FLMINT32 flmVerifyBlockHeader(
STATE_INFO * pStateInfo,
BLOCK_INFO * pBlockInfoRV,
FLMUINT uiBlockSize,
@@ -8395,7 +8395,7 @@ RCODE flmVerifyElement(
STATE_INFO * pStateInfo,
LFILE * pLFile,
IXD * pIxd,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
void getEntryInfo(
F_BTREE_BLK_HDR * pBlkHdr,
diff --git a/xflaim/src/flblddb.cpp b/xflaim/src/flblddb.cpp
index b8b66c4..2ae6cb9 100644
--- a/xflaim/src/flblddb.cpp
+++ b/xflaim/src/flblddb.cpp
@@ -77,7 +77,7 @@ FSTATIC void flmGetCreateOpts(
XFLM_DB_HDR * pDbHdr,
XFLM_CREATE_OPTS * pCreateOpts);
-FSTATIC FLMINT bldGetElmInfo(
+FSTATIC FLMINT32 bldGetElmInfo(
F_BTREE_BLK_HDR * pBlkHdr,
FLMUINT uiBlockSize,
FLMUINT uiElmNumber,
@@ -886,8 +886,8 @@ RCODE F_DbRebuild::rebuildDatabase( void)
RCODE rc2;
FLMBOOL bStartedTrans = FALSE;
- m_corruptInfo.uiErrLocale = XFLM_LOCALE_B_TREE;
- m_corruptInfo.uiErrLfType = XFLM_LF_COLLECTION;
+ m_corruptInfo.ui32ErrLocale = XFLM_LOCALE_B_TREE;
+ m_corruptInfo.ui32ErrLfType = XFLM_LF_COLLECTION;
m_callbackData.ui64NodesRecov = 0;
m_callbackData.ui64DiscardedDocs = 0;
@@ -909,7 +909,7 @@ RCODE F_DbRebuild::rebuildDatabase( void)
// Recover the dictionary
- m_callbackData.iDoingFlag = REBUILD_RECOVER_DICT;
+ m_callbackData.i32DoingFlag = REBUILD_RECOVER_DICT;
m_callbackData.bStartFlag = TRUE;
m_callbackData.ui64BytesExamined = 0;
@@ -925,7 +925,7 @@ RCODE F_DbRebuild::rebuildDatabase( void)
// Recover data
- m_callbackData.iDoingFlag = REBUILD_RECOVER_DATA;
+ m_callbackData.i32DoingFlag = REBUILD_RECOVER_DATA;
m_callbackData.bStartFlag = TRUE;
m_callbackData.ui64BytesExamined = 0;
@@ -1605,13 +1605,13 @@ Exit:
/***************************************************************************
Desc: Function to extract information about the current element
***************************************************************************/
-FSTATIC FLMINT bldGetElmInfo(
+FSTATIC FLMINT32 bldGetElmInfo(
F_BTREE_BLK_HDR * pBlkHdr,
FLMUINT uiBlockSize,
FLMUINT uiElmNumber,
F_ELM_INFO * pElmInfo)
{
- FLMINT iErrCode = 0;
+ FLMINT32 i32ErrCode = 0;
FLMBYTE * pucElm = NULL;
FLMUINT uiElmLen = 0;
FLMUINT uiElmKeyLen = 0;
@@ -1630,7 +1630,7 @@ FSTATIC FLMINT bldGetElmInfo(
if( uiElmNumber >= uiNumKeys)
{
flmAssert( 0);
- iErrCode = FLM_BAD_ELM_OFFSET;
+ i32ErrCode = FLM_BAD_ELM_OFFSET;
goto Exit;
}
@@ -1645,7 +1645,7 @@ FSTATIC FLMINT bldGetElmInfo(
{
if( pucElm + 2 > pucBlkEnd)
{
- iErrCode = FLM_BAD_ELM_LEN;
+ i32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -1663,7 +1663,7 @@ FSTATIC FLMINT bldGetElmInfo(
{
if( pucPtr + 2 > pucBlkEnd)
{
- iErrCode = FLM_BAD_ELM_LEN;
+ i32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -1675,7 +1675,7 @@ FSTATIC FLMINT bldGetElmInfo(
{
if( pucPtr > pucBlkEnd)
{
- iErrCode = FLM_BAD_ELM_LEN;
+ i32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -1688,7 +1688,7 @@ FSTATIC FLMINT bldGetElmInfo(
{
if( pucPtr + 2 > pucBlkEnd)
{
- iErrCode = FLM_BAD_ELM_LEN;
+ i32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -1700,7 +1700,7 @@ FSTATIC FLMINT bldGetElmInfo(
{
if( pucPtr > pucBlkEnd)
{
- iErrCode = FLM_BAD_ELM_LEN;
+ i32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -1726,7 +1726,7 @@ FSTATIC FLMINT bldGetElmInfo(
{
if( uiElmDataLen != 4)
{
- iErrCode = FLM_BAD_ELM_LEN;
+ i32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -1738,14 +1738,14 @@ FSTATIC FLMINT bldGetElmInfo(
default:
{
- iErrCode = FLM_BAD_BLK_TYPE;
+ i32ErrCode = FLM_BAD_BLK_TYPE;
goto Exit;
}
}
if( pucElm + uiElmLen > pucBlkEnd)
{
- iErrCode = FLM_BAD_ELM_LEN;
+ i32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -1754,13 +1754,13 @@ FSTATIC FLMINT bldGetElmInfo(
if( RC_BAD( flmCollation2Number( uiElmKeyLen, pucElmKey,
&ui64ElmNodeId, &bNeg, &uiBytesProcessed)))
{
- iErrCode = FLM_BAD_ELM_KEY;
+ i32ErrCode = FLM_BAD_ELM_KEY;
goto Exit;
}
if( bNeg || uiBytesProcessed != uiElmKeyLen || !ui64ElmNodeId)
{
- iErrCode = FLM_BAD_ELM_KEY;
+ i32ErrCode = FLM_BAD_ELM_KEY;
goto Exit;
}
}
@@ -1770,7 +1770,7 @@ FSTATIC FLMINT bldGetElmInfo(
if( pBlkHdr->stdBlkHdr.ui32NextBlkInChain)
{
- iErrCode = FLM_BAD_ELM_KEY;
+ i32ErrCode = FLM_BAD_ELM_KEY;
goto Exit;
}
}
@@ -1798,7 +1798,7 @@ Exit:
pElmInfo->ui32NextBlkInChain = pBlkHdr->stdBlkHdr.ui32NextBlkInChain;
pElmInfo->uiNumKeysInBlk = pBlkHdr->ui16NumKeys;
- return( iErrCode);
+ return( i32ErrCode);
}
/****************************************************************************
@@ -1816,11 +1816,11 @@ FSTATIC void flmGetCreateOpts(
pCreateOpts->ui32DefaultLanguage = pDbHdr->ui8DefaultLanguage;
pCreateOpts->ui32MinRflFileSize = pDbHdr->ui32RflMinFileSize;
pCreateOpts->ui32MaxRflFileSize = pDbHdr->ui32RflMaxFileSize;
- pCreateOpts->i32KeepRflFiles = (FLMINT32)(pDbHdr->ui8RflKeepFiles
+ pCreateOpts->bKeepRflFiles = (FLMBOOL)(pDbHdr->ui8RflKeepFiles
? TRUE
: FALSE);
- pCreateOpts->i32LogAbortedTransToRfl =
- (FLMINT32)(pDbHdr->ui8RflKeepAbortedTrans
+ pCreateOpts->bLogAbortedTransToRfl =
+ (FLMBOOL)(pDbHdr->ui8RflKeepAbortedTrans
? TRUE
: FALSE);
}
@@ -1831,8 +1831,8 @@ FSTATIC void flmGetCreateOpts(
pCreateOpts->ui32DefaultLanguage = XFLM_DEFAULT_LANG;
pCreateOpts->ui32MinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE;
pCreateOpts->ui32MaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE;
- pCreateOpts->i32KeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG;
- pCreateOpts->i32LogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG;
+ pCreateOpts->bKeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG;
+ pCreateOpts->bLogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG;
}
}
@@ -2191,7 +2191,7 @@ Desc:
RCODE F_RebuildNodeIStream::readNextFirstElm( void)
{
RCODE rc = NE_XFLM_OK;
- FLMINT iErrCode = 0;
+ FLMINT32 i32ErrCode = 0;
m_pCurState = NULL;
@@ -2213,11 +2213,11 @@ GetNextElement:
// Extract information about the element
- if( (iErrCode = bldGetElmInfo( m_firstElmState.blkUnion.pBTreeBlkHdr,
+ if( (i32ErrCode = bldGetElmInfo( m_firstElmState.blkUnion.pBTreeBlkHdr,
m_firstElmState.uiBlockSize, m_firstElmState.elmInfo.uiElmNumber,
&m_firstElmState.elmInfo)) != 0)
{
- if( RC_BAD( rc = m_pDbRebuild->reportCorruption( iErrCode,
+ if( RC_BAD( rc = m_pDbRebuild->reportCorruption( i32ErrCode,
FSBlkAddress( m_firstElmState.uiFileNumber, m_firstElmState.uiFileOffset),
m_firstElmState.elmInfo.uiElmNumber,
m_firstElmState.elmInfo.ui64ElmNodeId)))
@@ -2264,7 +2264,7 @@ Desc:
RCODE F_RebuildNodeIStream::readContinuationElm( void)
{
RCODE rc = NE_XFLM_OK;
- FLMINT iErrCode = 0;
+ FLMINT32 i32ErrCode = 0;
if( m_pCurState->elmInfo.uiElmNumber + 1 >=
m_pCurState->blkUnion.pBTreeBlkHdr->ui16NumKeys)
@@ -2294,11 +2294,11 @@ RCODE F_RebuildNodeIStream::readContinuationElm( void)
// Extract information about the element
- if( (iErrCode = bldGetElmInfo(
+ if( (i32ErrCode = bldGetElmInfo(
m_pCurState->blkUnion.pBTreeBlkHdr, m_pCurState->uiBlockSize,
m_pCurState->elmInfo.uiElmNumber, &m_pCurState->elmInfo)) != 0)
{
- if( RC_BAD( rc = m_pDbRebuild->reportCorruption( iErrCode,
+ if( RC_BAD( rc = m_pDbRebuild->reportCorruption( i32ErrCode,
FSBlkAddress( m_pCurState->uiFileNumber, m_pCurState->uiFileOffset),
m_pCurState->elmInfo.uiElmNumber, m_pCurState->elmInfo.ui64ElmNodeId)))
{
@@ -2695,7 +2695,7 @@ RCODE F_RebuildNodeIStream::readNode(
{
RCODE rc = NE_XFLM_OK;
F_CachedNode * pCachedNode = NULL;
- FLMINT iErrCode = 0;
+ FLMINT32 i32ErrCode = 0;
m_pCurState = NULL;
@@ -2731,10 +2731,10 @@ RCODE F_RebuildNodeIStream::readNode(
// Extract information about the element
- if( (iErrCode = bldGetElmInfo( m_firstElmState.blkUnion.pBTreeBlkHdr,
+ if( (i32ErrCode = bldGetElmInfo( m_firstElmState.blkUnion.pBTreeBlkHdr,
m_firstElmState.uiBlockSize, uiElmNumber, &m_firstElmState.elmInfo)) != 0)
{
- if( RC_BAD( rc = m_pDbRebuild->reportCorruption( iErrCode,
+ if( RC_BAD( rc = m_pDbRebuild->reportCorruption( i32ErrCode,
FSBlkAddress( m_firstElmState.uiFileNumber, m_firstElmState.uiFileOffset),
m_firstElmState.elmInfo.uiElmNumber,
m_firstElmState.elmInfo.ui64ElmNodeId)))
@@ -2808,7 +2808,7 @@ RCODE F_DbRebuild::determineBlkSize(
// Start from byte offset 0 in the first file.
- m_callbackData.iDoingFlag = REBUILD_GET_BLK_SIZ;
+ m_callbackData.i32DoingFlag = REBUILD_GET_BLK_SIZ;
m_callbackData.bStartFlag = TRUE;
for (;;)
diff --git a/xflaim/src/flchkdb.cpp b/xflaim/src/flchkdb.cpp
index 6d45999..15c6d8d 100644
--- a/xflaim/src/flchkdb.cpp
+++ b/xflaim/src/flchkdb.cpp
@@ -399,7 +399,7 @@ Begin_Check:
if (FSGetFileOffset( uiFileEnd) % uiBlockSize != 0)
{
if (RC_BAD( rc = chkReportError( FLM_BAD_FILE_SIZE, XFLM_LOCALE_NONE,
- 0, 0, 0xFF, uiFileEnd, 0, 0, 0)))
+ 0, 0, 0xFF, (FLMUINT32)uiFileEnd, 0, 0, 0)))
{
goto Exit;
}
@@ -542,7 +542,7 @@ RCODE F_DbCheck::verifyBlkChain(
)
{
RCODE rc = NE_XFLM_OK;
- FLMINT iVerifyCode = 0;
+ FLMINT32 i32VerifyCode = 0;
F_CachedBlock * pSCache = NULL;
F_BLK_HDR * pBlkHdr = NULL;
FLMUINT uiPrevBlkAddress;
@@ -562,9 +562,9 @@ RCODE F_DbCheck::verifyBlkChain(
if ((uiBlkType == BT_LFH_BLK) && (uiFirstBlkAddr == 0))
{
- iVerifyCode = FLM_BAD_LFH_LIST_PTR;
- (void)chkReportError( iVerifyCode,
- uiLocale,
+ i32VerifyCode = FLM_BAD_LFH_LIST_PTR;
+ (void)chkReportError( i32VerifyCode,
+ (FLMUINT32)uiLocale,
0,
0,
0xFF,
@@ -598,7 +598,7 @@ Restart_Chain:
{
StateInfo.pBlkHdr = NULL;
if( RC_BAD( rc = blkRead( StateInfo.ui32BlkAddress, &pBlkHdr,
- &pSCache, &iVerifyCode)))
+ &pSCache, &i32VerifyCode)))
{
if (rc == NE_XFLM_OLD_VIEW)
{
@@ -618,10 +618,10 @@ Restart_Chain:
m_Progress.ui64BytesExamined = ui64SaveBytesExamined;
goto Restart_Chain;
}
- pBlkInfo->iErrCode = iVerifyCode;
+ pBlkInfo->i32ErrCode = i32VerifyCode;
pBlkInfo->uiNumErrors++;
- rc = chkReportError( iVerifyCode,
- uiLocale,
+ rc = chkReportError( i32VerifyCode,
+ (FLMUINT32)uiLocale,
0,
0,
0xFF,
@@ -640,17 +640,17 @@ Restart_Chain:
f_yieldCPU();
- if ((iVerifyCode = flmVerifyBlockHeader( &StateInfo,
+ if ((i32VerifyCode = flmVerifyBlockHeader( &StateInfo,
pBlkInfo,
uiBlockSize,
0xFFFFFFFF,
uiPrevBlkAddress,
TRUE)) != 0)
{
- pBlkInfo->iErrCode = iVerifyCode;
+ pBlkInfo->i32ErrCode = i32VerifyCode;
pBlkInfo->uiNumErrors++;
- chkReportError( iVerifyCode,
- uiLocale,
+ chkReportError( i32VerifyCode,
+ (FLMUINT32)uiLocale,
0,
0,
0xFF,
@@ -668,20 +668,20 @@ Restart_Chain:
switch (uiBlkType)
{
case BT_LFH_BLK:
- iVerifyCode = FLM_BAD_LFH_LIST_END;
+ i32VerifyCode = FLM_BAD_LFH_LIST_END;
break;
case BT_FREE:
- iVerifyCode = FLM_BAD_AVAIL_LIST_END;
+ i32VerifyCode = FLM_BAD_AVAIL_LIST_END;
break;
}
- pBlkInfo->iErrCode = iVerifyCode;
+ pBlkInfo->i32ErrCode = i32VerifyCode;
pBlkInfo->uiNumErrors++;
- chkReportError( iVerifyCode,
- uiLocale,
+ chkReportError( i32VerifyCode,
+ (FLMUINT32)uiLocale,
0,
0,
0xFF,
- uiPrevBlkAddress,
+ (FLMUINT32)uiPrevBlkAddress,
0,
0,
0);
@@ -699,7 +699,7 @@ Exit:
f_free( &pBlkHdr);
}
- if (RC_OK(rc) && (iVerifyCode != 0))
+ if (RC_OK(rc) && (i32VerifyCode != 0))
{
rc = RC_SET( NE_XFLM_DATA_ERROR);
}
@@ -716,9 +716,9 @@ RCODE F_DbCheck::verifyLFHBlocks(
{
RCODE rc = NE_XFLM_OK;
- m_Progress.uiLfNumber = 0;
- m_Progress.uiLfType = 0;
- m_Progress.iCheckPhase = XFLM_CHECK_LFH_BLOCKS;
+ m_Progress.ui32LfNumber = 0;
+ m_Progress.ui32LfType = 0;
+ m_Progress.i32CheckPhase = XFLM_CHECK_LFH_BLOCKS;
m_Progress.bStartFlag = TRUE;
if (RC_BAD( rc = chkCallProgFunc()))
{
@@ -753,9 +753,9 @@ RCODE F_DbCheck::verifyAvailList(
{
RCODE rc = NE_XFLM_OK;
- m_Progress.uiLfNumber = 0;
- m_Progress.uiLfType = 0;
- m_Progress.iCheckPhase = XFLM_CHECK_AVAIL_BLOCKS;
+ m_Progress.ui32LfNumber = 0;
+ m_Progress.ui32LfType = 0;
+ m_Progress.i32CheckPhase = XFLM_CHECK_AVAIL_BLOCKS;
m_Progress.bStartFlag = TRUE;
if (RC_BAD( rc = chkCallProgFunc()))
{
@@ -823,7 +823,7 @@ void FLMAPI F_DbInfo::getBTreeBlockStats(
FLMUINT64 * pui64ContElementCount,
FLMUINT64 * pui64ContElmBytes,
FLMUINT * puiBlockCount,
- FLMINT * piLastError,
+ FLMINT32 * pi32LastError,
FLMUINT * puiNumErrors
)
{
@@ -839,7 +839,7 @@ void FLMAPI F_DbInfo::getBTreeBlockStats(
*pui64ContElementCount = pLfHdr->pLevelInfo [uiLevel].BlockInfo.ui64ContElementCount;
*pui64ContElmBytes = pLfHdr->pLevelInfo [uiLevel].BlockInfo.ui64ContElmBytes;
*puiBlockCount = pLfHdr->pLevelInfo [uiLevel].BlockInfo.uiBlockCount;
- *piLastError = pLfHdr->pLevelInfo [uiLevel].BlockInfo.iErrCode;
+ *pi32LastError = pLfHdr->pLevelInfo [uiLevel].BlockInfo.i32ErrCode;
*puiNumErrors = pLfHdr->pLevelInfo [uiLevel].BlockInfo.uiNumErrors;
}
else
@@ -851,7 +851,7 @@ void FLMAPI F_DbInfo::getBTreeBlockStats(
*pui64ContElementCount = 0;
*pui64ContElmBytes = 0;
*puiBlockCount = 0;
- *piLastError = 0;
+ *pi32LastError = 0;
*puiNumErrors = 0;
}
}
diff --git a/xflaim/src/flchkix.cpp b/xflaim/src/flchkix.cpp
index e50f5dc..5bb7c75 100644
--- a/xflaim/src/flchkix.cpp
+++ b/xflaim/src/flchkix.cpp
@@ -773,7 +773,7 @@ RCODE F_DbCheck::addDelKeyRef(
// Update statistics
- m_Progress.uiNumProblemsFixed++;
+ m_Progress.ui32NumProblemsFixed++;
}
Exit:
@@ -802,7 +802,7 @@ Desc: Populates the XFLM_CORRUPT_INFO structure and calls the user's
*********************************************************************/
RCODE F_DbCheck::reportIxError(
STATE_INFO * pStateInfo,
- FLMINT iErrCode,
+ FLMINT32 i32ErrCode,
FLMBYTE * pucErrKey,
FLMUINT uiErrKeyLen,
FLMBOOL * pbFixErrRV
@@ -831,10 +831,10 @@ RCODE F_DbCheck::reportIxError(
// Fix corruptions by default unless the app says not to.
- CorruptInfo.uiErrLocale = XFLM_LOCALE_INDEX;
- CorruptInfo.iErrCode = iErrCode;
- CorruptInfo.uiErrLfNumber = m_pIxd->uiIndexNum;
- CorruptInfo.uiErrElmOffset = pStateInfo->uiElmOffset;
+ CorruptInfo.ui32ErrLocale = XFLM_LOCALE_INDEX;
+ CorruptInfo.i32ErrCode = i32ErrCode;
+ CorruptInfo.ui32ErrLfNumber = (FLMUINT32)m_pIxd->uiIndexNum;
+ CorruptInfo.ui32ErrElmOffset = (FLMUINT32)pStateInfo->uiElmOffset;
// Generate the key tree using the key that caused the error
diff --git a/xflaim/src/flchktr.cpp b/xflaim/src/flchktr.cpp
index 9172be6..e91cae3 100644
--- a/xflaim/src/flchktr.cpp
+++ b/xflaim/src/flchktr.cpp
@@ -40,7 +40,7 @@ RCODE F_DbCheck::blkRead(
FLMUINT uiBlkAddress,
F_BLK_HDR ** ppBlkHdr,
F_CachedBlock ** ppSCache,
- FLMINT * piBlkErrCodeRV)
+ FLMINT32 * pi32BlkErrCodeRV)
{
RCODE rc = NE_XFLM_OK;
@@ -159,16 +159,16 @@ RCODE F_DbCheck::blkRead(
Exit:
- *piBlkErrCodeRV = 0;
+ *pi32BlkErrCodeRV = 0;
if (RC_BAD( rc))
{
switch (rc)
{
case NE_XFLM_DATA_ERROR:
- *piBlkErrCodeRV = FLM_COULD_NOT_SYNC_BLK;
+ *pi32BlkErrCodeRV = FLM_COULD_NOT_SYNC_BLK;
break;
case NE_XFLM_BLOCK_CRC:
- *piBlkErrCodeRV = FLM_BAD_BLK_CHECKSUM;
+ *pi32BlkErrCodeRV = FLM_BAD_BLK_CHECKSUM;
break;
}
}
@@ -235,27 +235,27 @@ Exit:
Desc: Report an error
*********************************************************************/
RCODE F_DbCheck::chkReportError(
- FLMINT iErrCode,
- FLMUINT uiErrLocale,
- FLMUINT uiErrLfNumber,
- FLMUINT uiErrLfType,
- FLMUINT uiErrBTreeLevel,
- FLMUINT uiErrBlkAddress,
- FLMUINT uiErrParentBlkAddress,
- FLMUINT uiErrElmOffset,
+ FLMINT32 i32ErrCode,
+ FLMUINT32 ui32ErrLocale,
+ FLMUINT32 ui32ErrLfNumber,
+ FLMUINT32 ui32ErrLfType,
+ FLMUINT32 ui32ErrBTreeLevel,
+ FLMUINT32 ui32ErrBlkAddress,
+ FLMUINT32 ui32ErrParentBlkAddress,
+ FLMUINT32 ui32ErrElmOffset,
FLMUINT64 ui64ErrNodeId)
{
XFLM_CORRUPT_INFO CorruptInfo;
FLMBOOL bFixErr;
- CorruptInfo.iErrCode = iErrCode;
- CorruptInfo.uiErrLocale = uiErrLocale;
- CorruptInfo.uiErrLfNumber = uiErrLfNumber;
- CorruptInfo.uiErrLfType = uiErrLfType;
- CorruptInfo.uiErrBTreeLevel = uiErrBTreeLevel;
- CorruptInfo.uiErrBlkAddress = uiErrBlkAddress;
- CorruptInfo.uiErrParentBlkAddress = uiErrParentBlkAddress;
- CorruptInfo.uiErrElmOffset = uiErrElmOffset;
+ CorruptInfo.i32ErrCode = i32ErrCode;
+ CorruptInfo.ui32ErrLocale = ui32ErrLocale;
+ CorruptInfo.ui32ErrLfNumber = ui32ErrLfNumber;
+ CorruptInfo.ui32ErrLfType = ui32ErrLfType;
+ CorruptInfo.ui32ErrBTreeLevel = ui32ErrBTreeLevel;
+ CorruptInfo.ui32ErrBlkAddress = ui32ErrBlkAddress;
+ CorruptInfo.ui32ErrParentBlkAddress = ui32ErrParentBlkAddress;
+ CorruptInfo.ui32ErrElmOffset = ui32ErrElmOffset;
CorruptInfo.ui64ErrNodeId = ui64ErrNodeId;
CorruptInfo.ifpErrIxKey = NULL;
@@ -265,7 +265,7 @@ RCODE F_DbCheck::chkReportError(
m_LastStatusRc = m_pDbCheckStatus->reportCheckErr( &CorruptInfo, &bFixErr);
}
- if (iErrCode != FLM_OLD_VIEW)
+ if (i32ErrCode != FLM_OLD_VIEW)
{
m_bPhysicalCorrupt = TRUE;
m_uiFlags &= ~XFLM_DO_LOGICAL_CHECK;
@@ -273,4 +273,3 @@ RCODE F_DbCheck::chkReportError(
return( m_LastStatusRc);
}
-
diff --git a/xflaim/src/flverify.cpp b/xflaim/src/flverify.cpp
index 0b8650a..03a4a55 100644
--- a/xflaim/src/flverify.cpp
+++ b/xflaim/src/flverify.cpp
@@ -51,49 +51,49 @@ FSTATIC RCODE verifyRootLink(
FLMUINT uiRSEntrySize,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
FSTATIC RCODE verifyParentLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
FSTATIC RCODE verifyFirstChildLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
FSTATIC RCODE verifyLastChildLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
FSTATIC RCODE verifyPrevSiblingLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
FSTATIC RCODE verifyNextSiblingLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
FSTATIC RCODE verifyAnnotationLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode);
+ FLMINT32 * pi32ErrCode);
/********************************************************************
Desc: Verifies a block's header and sets up the STATE_INFO structure
to verify the rest of the block.
*********************************************************************/
-FLMINT flmVerifyBlockHeader(
+FLMINT32 flmVerifyBlockHeader(
STATE_INFO * pStateInfo,
BLOCK_INFO * pBlockInfo,
FLMUINT uiBlockSize,
@@ -224,7 +224,7 @@ RCODE flmVerifyElement(
STATE_INFO * pStateInfo,
LFILE * pLFile,
IXD * pIxd,
- FLMINT * piErrCode)
+ FLMINT32 * pi32ErrCode)
{
RCODE rc = NE_XFLM_OK;
FLMBYTE * pucEntry;
@@ -232,7 +232,7 @@ RCODE flmVerifyElement(
FLMUINT32 ui32ChildAddr = 0;
FLMUINT uiCounts = 0;
- *piErrCode = 0;
+ *pi32ErrCode = 0;
// Get the pointer to the element.
@@ -244,7 +244,7 @@ RCODE flmVerifyElement(
if ((FLMUINT)pucEntry > (FLMUINT)pStateInfo->pBlkHdr +
pStateInfo->pDb->getDatabase()->getBlockSize())
{
- *piErrCode = FLM_BAD_ELM_OFFSET;
+ *pi32ErrCode = FLM_BAD_ELM_OFFSET;
goto Exit;
}
@@ -358,7 +358,7 @@ RCODE flmVerifyElement(
default:
{
- *piErrCode = FLM_BAD_BLK_TYPE;
+ *pi32ErrCode = FLM_BAD_BLK_TYPE;
goto Exit;
}
}
@@ -369,7 +369,7 @@ RCODE flmVerifyElement(
(FLMBYTE *)pStateInfo->pBlkHdr +
pStateInfo->pDb->getDatabase()->getBlockSize())
{
- *piErrCode = FLM_BAD_ELM_LEN;
+ *pi32ErrCode = FLM_BAD_ELM_LEN;
goto Exit;
}
@@ -377,7 +377,7 @@ RCODE flmVerifyElement(
if( pStateInfo->uiElmKeyLen > XFLM_MAX_KEY_SIZE)
{
- *piErrCode = FLM_BAD_ELM_KEY_SIZE;
+ *pi32ErrCode = FLM_BAD_ELM_KEY_SIZE;
goto Exit;
}
@@ -387,7 +387,7 @@ RCODE flmVerifyElement(
pStateInfo->pBlkHdr, pStateInfo->pucElmKey, pStateInfo->uiElmKeyLen,
pStateInfo->uiElmOffset)))
{
- *piErrCode = FLM_BAD_ELM_KEY_ORDER;
+ *pi32ErrCode = FLM_BAD_ELM_KEY_ORDER;
goto Exit;
}
@@ -407,7 +407,7 @@ RCODE flmVerifyElement(
{
if( !flmVerifyElementChain( pStateInfo, pLFile))
{
- *piErrCode = FLM_BAD_ELEMENT_CHAIN;
+ *pi32ErrCode = FLM_BAD_ELEMENT_CHAIN;
goto Exit;
}
}
@@ -420,20 +420,20 @@ RCODE flmVerifyElement(
pStateInfo->uiElmKeyLen, pStateInfo->pucElmKey,
&pStateInfo->ui64ElmNodeId, &bNeg, &uiBytesProcessed)))
{
- *piErrCode = FLM_BAD_ELM_KEY;
+ *pi32ErrCode = FLM_BAD_ELM_KEY;
goto Exit;
}
if( bNeg || uiBytesProcessed != pStateInfo->uiElmKeyLen)
{
- *piErrCode = FLM_BAD_ELM_KEY;
+ *pi32ErrCode = FLM_BAD_ELM_KEY;
goto Exit;
}
if( !pStateInfo->ui64ElmNodeId)
{
flmAssert( 0);
- *piErrCode = FLM_BAD_ELM_KEY;
+ *pi32ErrCode = FLM_BAD_ELM_KEY;
goto Exit;
}
}
@@ -443,7 +443,7 @@ RCODE flmVerifyElement(
if( pStateInfo->pBlkHdr->ui32NextBlkInChain)
{
- *piErrCode = FLM_BAD_ELM_KEY;
+ *pi32ErrCode = FLM_BAD_ELM_KEY;
goto Exit;
}
}
@@ -973,7 +973,7 @@ RCODE F_DbCheck::buildIndexKeyList(
// Set information for the result set sort phase.
- m_Progress.iCheckPhase = XFLM_CHECK_RS_SORT;
+ m_Progress.i32CheckPhase = XFLM_CHECK_RS_SORT;
m_Progress.bStartFlag = TRUE;
if ((pKeyColl = f_new F_KeyCollector( this)) == NULL)
@@ -1246,7 +1246,7 @@ RCODE F_DbCheck::verifyBTrees(
uiCurrLf = 0;
while (uiCurrLf < m_pDbInfo->m_uiNumLogicalFiles)
{
- m_Progress.uiCurrLF = uiCurrLf + 1;
+ m_Progress.ui32CurrLF = (FLMUINT32)(uiCurrLf + 1);
pLogicalFile = &m_pDbInfo->m_pLogicalFiles[uiCurrLf];
if (pLogicalFile->eLfType == XFLM_LF_COLLECTION)
@@ -1326,10 +1326,10 @@ RCODE F_DbCheck::verifyBTrees(
// Setup XFLM_PROGRESS_CHECK_INFO structure
- m_Progress.iCheckPhase = XFLM_CHECK_B_TREE;
+ m_Progress.i32CheckPhase = XFLM_CHECK_B_TREE;
m_Progress.bStartFlag = TRUE;
- m_Progress.uiLfNumber = m_pLFile->uiLfNum;
- m_Progress.uiLfType = m_pLFile->eLfType;
+ m_Progress.ui32LfNumber = (FLMUINT32)m_pLFile->uiLfNum;
+ m_Progress.ui32LfType = (FLMUINT32)m_pLFile->eLfType;
if (RC_BAD( rc = chkCallProgFunc()))
{
@@ -1688,15 +1688,15 @@ Reset:
if (State[ 0].pNodeRS)
{
- FLMINT iErrCode;
+ FLMINT32 i32ErrCode;
// Setup the current progress phase
- m_Progress.iCheckPhase = XFLM_CHECK_DOM_LINKS;
+ m_Progress.i32CheckPhase = XFLM_CHECK_DOM_LINKS;
m_Progress.bStartFlag = TRUE;
- m_Progress.uiLfNumber = m_pLFile->uiLfNum;
- m_Progress.uiLfType = m_pLFile->eLfType;
+ m_Progress.ui32LfNumber = (FLMUINT32)m_pLFile->uiLfNum;
+ m_Progress.ui32LfType = (FLMUINT32)m_pLFile->eLfType;
if (RC_BAD( rc = chkCallProgFunc()))
{
@@ -1707,16 +1707,16 @@ Reset:
f_yieldCPU();
- m_LastStatusRc = verifyNodePointers( &State[ 0], &iErrCode);
+ m_LastStatusRc = verifyNodePointers( &State[ 0], &i32ErrCode);
- if (iErrCode)
+ if (i32ErrCode)
{
- chkReportError( iErrCode,
+ chkReportError( i32ErrCode,
XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber,
- m_Progress.uiLfType,
- State[ 0].uiLevel,
- m_pLFile->uiBlkAddress,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)State[ 0].uiLevel,
+ (FLMUINT32)m_pLFile->uiBlkAddress,
0,
0,
0);
@@ -1754,19 +1754,19 @@ Reset:
if (State [uiCurrLevel].ui32NextBlkAddr != 0xFFFFFFFF &&
State [uiCurrLevel].ui32NextBlkAddr != 0)
{
- FLMINT iBlkErrCode;
+ FLMINT32 i32BlkErrCode;
// Verify our finding. Get the block in question and see
// if it realy has a problem.
if (RC_BAD( rc = blkRead( State[ uiCurrLevel].ui32BlkAddress,
- &pBlkHdr, &pSCache, &iBlkErrCode)))
+ &pBlkHdr, &pSCache, &i32BlkErrCode)))
{
// Log the error.
- if (iBlkErrCode)
+ if (i32BlkErrCode)
{
- chkReportError( iBlkErrCode, XFLM_LOCALE_LFH_LIST,
+ chkReportError( i32BlkErrCode, XFLM_LOCALE_LFH_LIST,
0, 0, 0xFF, State[ uiCurrLevel].ui32BlkAddress,
0, 0, 0);
}
@@ -1776,7 +1776,9 @@ Reset:
if (pBlkHdr->ui32NextBlkInChain != 0)
{
chkReportError( FLM_BAD_LAST_BLK_NEXT, XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber, m_Progress.uiLfType, uiCurrLevel,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)uiCurrLevel,
0, 0, 0, 0);
}
@@ -1919,7 +1921,7 @@ RCODE F_DbCheck::setupLfTable()
// the logical check, can be built.
m_pDbInfo->freeLogicalFiles();
- m_Progress.uiNumLFs = 0;
+ m_Progress.ui32NumLFs = 0;
if (pDict)
{
@@ -1953,7 +1955,7 @@ RCODE F_DbCheck::setupLfTable()
m_pDbInfo->m_uiNumLogicalFiles = m_pDbInfo->m_uiNumIndexes +
m_pDbInfo->m_uiNumCollections;
- m_Progress.uiNumLFs = m_pDbInfo->m_uiNumLogicalFiles;
+ m_Progress.ui32NumLFs = (FLMUINT32)m_pDbInfo->m_uiNumLogicalFiles;
// Allocate memory for each collection and index, then set up each
// collection and index
@@ -2137,7 +2139,7 @@ RCODE F_DbCheck::getLfInfo(
F_CachedBlock * pSCache = NULL;
F_BLK_HDR * pBlkHdr = NULL;
FLMUINT uiSaveLevel;
- FLMINT iBlkErrCode;
+ FLMINT32 i32BlkErrCode;
pLogicalFile->eLfType = pLFile->eLfType;
pLogicalFile->uiLfNum = pLFile->uiLfNum;
@@ -2146,19 +2148,19 @@ RCODE F_DbCheck::getLfInfo(
// Read in the block containing the logical file header.
if (RC_BAD( rc = blkRead( pLFile->uiBlkAddress,
- &pBlkHdr, &pSCache, &iBlkErrCode)))
+ &pBlkHdr, &pSCache, &i32BlkErrCode)))
{
// Log the error.
- if (iBlkErrCode)
+ if (i32BlkErrCode)
{
- chkReportError( iBlkErrCode,
+ chkReportError( i32BlkErrCode,
XFLM_LOCALE_LFH_LIST,
0,
0,
0xFF,
- pLFile->uiBlkAddress,
+ (FLMUINT32)pLFile->uiBlkAddress,
0,
0,
0);
@@ -2173,16 +2175,16 @@ RCODE F_DbCheck::getLfInfo(
if (RC_BAD( rc = blkRead( pLFile->uiRootBlk,
&pBlkHdr,
&pSCache,
- &iBlkErrCode)))
+ &i32BlkErrCode)))
{
- if (iBlkErrCode)
+ if (i32BlkErrCode)
{
- chkReportError( iBlkErrCode,
+ chkReportError( i32BlkErrCode,
XFLM_LOCALE_B_TREE,
- pLFile->uiLfNum,
- pLFile->eLfType,
+ (FLMUINT32)pLFile->uiLfNum,
+ (FLMUINT32)pLFile->eLfType,
0xFF,
- pLFile->uiRootBlk,
+ (FLMUINT32)pLFile->uiRootBlk,
0,
0,
0);
@@ -2199,10 +2201,10 @@ RCODE F_DbCheck::getLfInfo(
{
chkReportError( FLM_BAD_BLK_HDR_LEVEL,
XFLM_LOCALE_B_TREE,
- pLFile->uiLfNum,
- pLFile->eLfType,
- (FLMUINT)(((F_BTREE_BLK_HDR *)pBlkHdr)->ui8BlkLevel),
- pLFile->uiRootBlk,
+ (FLMUINT32)pLFile->uiLfNum,
+ (FLMUINT32)pLFile->eLfType,
+ (FLMUINT32)(((F_BTREE_BLK_HDR *)pBlkHdr)->ui8BlkLevel),
+ (FLMUINT32)pLFile->uiRootBlk,
0,
0,
0);
@@ -2254,7 +2256,7 @@ Desc: Goes throught the (finalized) result set and validates that all the
*****************************************************************************/
RCODE F_DbCheck::verifyNodePointers(
STATE_INFO * pStateInfo,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -2266,9 +2268,9 @@ RCODE F_DbCheck::verifyNodePointers(
FLMBYTE pucKey[ XFLM_MAX_KEY_SIZE];
FLMUINT uiKeyLength = XFLM_MAX_KEY_SIZE;
F_Btree * pBTree = NULL;
- FLMINT iErrCode = 0;
+ FLMINT32 i32ErrCode = 0;
- *piErrCode = 0;
+ *pi32ErrCode = 0;
if (RC_BAD( rc = f_calloc( sizeof( NODE_RS_ENTRY), &pRSEntry)))
{
@@ -2331,17 +2333,18 @@ RCODE F_DbCheck::verifyNodePointers(
bFirst = FALSE;
if (RC_BAD( rc = verifyRootLink(
- pRSEntry, uiRSEntrySize, pTmpRSEntry, pResult, &iErrCode)))
+ pRSEntry, uiRSEntrySize, pTmpRSEntry, pResult, &i32ErrCode)))
{
goto Exit;
}
- if (iErrCode)
+ if (i32ErrCode)
{
- chkReportError( iErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, 0, 0, 0, (FLMUINT)~(0),
+ chkReportError( i32ErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, 0, 0, 0, FLM_MAX_UINT32,
pRSEntry->hdr.ui64NodeId);
- iErrCode = 0;
+ i32ErrCode = 0;
m_Progress.ui64NumBrokenDomLinks++;
}
else
@@ -2350,17 +2353,18 @@ RCODE F_DbCheck::verifyNodePointers(
}
if (RC_BAD( rc = verifyParentLink(
- pRSEntry, pTmpRSEntry, pResult, &iErrCode)))
+ pRSEntry, pTmpRSEntry, pResult, &i32ErrCode)))
{
goto Exit;
}
- if (iErrCode)
+ if (i32ErrCode)
{
- chkReportError( iErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, 0, 0, 0, (FLMUINT)~(0),
+ chkReportError( i32ErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, 0, 0, 0, FLM_MAX_UINT32,
pRSEntry->hdr.ui64NodeId);
- iErrCode = 0;
+ i32ErrCode = 0;
m_Progress.ui64NumBrokenDomLinks++;
}
else
@@ -2369,17 +2373,18 @@ RCODE F_DbCheck::verifyNodePointers(
}
if( RC_BAD( rc = verifyFirstChildLink( pRSEntry, pTmpRSEntry,
- pResult, &iErrCode)))
+ pResult, &i32ErrCode)))
{
goto Exit;
}
- if( iErrCode)
+ if( i32ErrCode)
{
- chkReportError( iErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, 0, 0, 0, (FLMUINT)~(0),
+ chkReportError( i32ErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, 0, 0, 0, FLM_MAX_UINT32,
pRSEntry->hdr.ui64NodeId);
- iErrCode = 0;
+ i32ErrCode = 0;
m_Progress.ui64NumBrokenDomLinks++;
}
else
@@ -2388,17 +2393,18 @@ RCODE F_DbCheck::verifyNodePointers(
}
if (RC_BAD( rc = verifyLastChildLink(
- pRSEntry, pTmpRSEntry, pResult, &iErrCode)))
+ pRSEntry, pTmpRSEntry, pResult, &i32ErrCode)))
{
goto Exit;
}
- if (iErrCode)
+ if (i32ErrCode)
{
- chkReportError( iErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, 0, 0, 0, (FLMUINT)~(0),
+ chkReportError( i32ErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, 0, 0, 0, FLM_MAX_UINT32,
pRSEntry->hdr.ui64NodeId);
- iErrCode = 0;
+ i32ErrCode = 0;
m_Progress.ui64NumBrokenDomLinks++;
}
else
@@ -2407,17 +2413,18 @@ RCODE F_DbCheck::verifyNodePointers(
}
if (RC_BAD( rc = verifyPrevSiblingLink(
- pRSEntry, pTmpRSEntry, pResult, &iErrCode)))
+ pRSEntry, pTmpRSEntry, pResult, &i32ErrCode)))
{
goto Exit;
}
- if (iErrCode)
+ if (i32ErrCode)
{
- chkReportError( iErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, 0, 0, 0, (FLMUINT)~(0),
+ chkReportError( i32ErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, 0, 0, 0, FLM_MAX_UINT32,
pRSEntry->hdr.ui64NodeId);
- iErrCode = 0;
+ i32ErrCode = 0;
m_Progress.ui64NumBrokenDomLinks++;
}
else
@@ -2426,17 +2433,18 @@ RCODE F_DbCheck::verifyNodePointers(
}
if (RC_BAD( rc = verifyNextSiblingLink(
- pRSEntry, pTmpRSEntry, pResult, &iErrCode)))
+ pRSEntry, pTmpRSEntry, pResult, &i32ErrCode)))
{
goto Exit;
}
- if (iErrCode)
+ if (i32ErrCode)
{
- chkReportError( iErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, 0, 0, 0, (FLMUINT)~(0),
+ chkReportError( i32ErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, 0, 0, 0, FLM_MAX_UINT32,
pRSEntry->hdr.ui64NodeId);
- iErrCode = 0;
+ i32ErrCode = 0;
m_Progress.ui64NumBrokenDomLinks++;
}
else
@@ -2445,17 +2453,18 @@ RCODE F_DbCheck::verifyNodePointers(
}
if (RC_BAD( rc = verifyAnnotationLink(
- pRSEntry, pTmpRSEntry, pResult, &iErrCode)))
+ pRSEntry, pTmpRSEntry, pResult, &i32ErrCode)))
{
goto Exit;
}
- if (iErrCode)
+ if (i32ErrCode)
{
- chkReportError( iErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, 0, 0, 0, (FLMUINT)~(0),
+ chkReportError( i32ErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, 0, 0, 0, FLM_MAX_UINT32,
pRSEntry->hdr.ui64NodeId);
- iErrCode = 0;
+ i32ErrCode = 0;
m_Progress.ui64NumBrokenDomLinks++;
}
else
@@ -2501,7 +2510,7 @@ FSTATIC RCODE verifyRootLink(
FLMUINT uiRSEntrySize,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -2526,7 +2535,7 @@ FSTATIC RCODE verifyRootLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_ROOT_LINK;
+ *pi32ErrCode = FLM_BAD_ROOT_LINK;
goto Exit;
}
@@ -2536,7 +2545,7 @@ FSTATIC RCODE verifyRootLink(
// Cannot have a parent node
if (pTmpRSEntry->hdr.ui16BitMap & CHK_BM_PARENT_ID)
{
- *piErrCode = FLM_BAD_ROOT_PARENT;
+ *pi32ErrCode = FLM_BAD_ROOT_PARENT;
goto Exit;
}
@@ -2545,7 +2554,7 @@ FSTATIC RCODE verifyRootLink(
pTmpRSEntry->hdr.ui16Flags & CHK_LAST_CHILD_VERIFIED ||
pTmpRSEntry->hdr.ui16Flags & CHK_ANNOTATION_VERIFIED)
{
- *piErrCode = FLM_BAD_ROOT_LINK;
+ *pi32ErrCode = FLM_BAD_ROOT_LINK;
goto Exit;
}
@@ -2564,7 +2573,7 @@ FSTATIC RCODE verifyRootLink(
// Cannot have a parent node
if (pRSEntry->hdr.ui16BitMap & CHK_BM_PARENT_ID)
{
- *piErrCode = FLM_BAD_ROOT_LINK;
+ *pi32ErrCode = FLM_BAD_ROOT_LINK;
goto Exit;
}
@@ -2573,7 +2582,7 @@ FSTATIC RCODE verifyRootLink(
pRSEntry->hdr.ui16Flags & CHK_LAST_CHILD_VERIFIED ||
pRSEntry->hdr.ui16Flags & CHK_ANNOTATION_VERIFIED)
{
- *piErrCode = FLM_BAD_ROOT_LINK;
+ *pi32ErrCode = FLM_BAD_ROOT_LINK;
goto Exit;
}
@@ -2600,7 +2609,7 @@ FSTATIC RCODE verifyParentLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -2620,7 +2629,7 @@ FSTATIC RCODE verifyParentLink(
pRSEntry->hdr.ui16Flags & CHK_LAST_CHILD_VERIFIED ||
pRSEntry->hdr.ui16Flags & CHK_ANNOTATION_VERIFIED)
{
- *piErrCode = FLM_BAD_PARENT_LINK;
+ *pi32ErrCode = FLM_BAD_PARENT_LINK;
}
goto Exit;
@@ -2628,7 +2637,7 @@ FSTATIC RCODE verifyParentLink(
if (ui64ParentId == pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_PARENT_LINK;
+ *pi32ErrCode = FLM_BAD_PARENT_LINK;
goto Exit;
}
@@ -2639,7 +2648,7 @@ FSTATIC RCODE verifyParentLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_PARENT_LINK;
+ *pi32ErrCode = FLM_BAD_PARENT_LINK;
goto Exit;
}
@@ -2649,7 +2658,7 @@ FSTATIC RCODE verifyParentLink(
{
if (ui64RootId != ui64TmpRootId)
{
- *piErrCode = FLM_BAD_PARENT_LINK;
+ *pi32ErrCode = FLM_BAD_PARENT_LINK;
goto Exit;
}
}
@@ -2657,7 +2666,7 @@ FSTATIC RCODE verifyParentLink(
{
if (ui64ParentId != ui64RootId)
{
- *piErrCode = FLM_BAD_PARENT_LINK;
+ *pi32ErrCode = FLM_BAD_PARENT_LINK;
goto Exit;
}
}
@@ -2683,7 +2692,7 @@ FSTATIC RCODE verifyFirstChildLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode)
+ FLMINT32 * pi32ErrCode)
{
RCODE rc = NE_XFLM_OK;
FLMUINT64 ui64FirstChildId = getLinkVal( CHK_BM_FIRST_CHILD, pRSEntry);
@@ -2700,14 +2709,14 @@ FSTATIC RCODE verifyFirstChildLink(
if (getLinkVal( CHK_BM_LAST_CHILD, pRSEntry))
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
}
if (pRSEntry->hdr.ui16Flags & CHK_PARENT_VERIFIED)
{
if( !getLinkVal( CHK_BM_ANNOTATION, pRSEntry))
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
}
}
goto Exit;
@@ -2716,7 +2725,7 @@ FSTATIC RCODE verifyFirstChildLink(
if (ui64FirstChildId == pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
goto Exit;
}
@@ -2727,7 +2736,7 @@ FSTATIC RCODE verifyFirstChildLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
goto Exit;
}
@@ -2738,7 +2747,7 @@ FSTATIC RCODE verifyFirstChildLink(
{
if (ui64RootId != ui64TmpRootId)
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
goto Exit;
}
}
@@ -2746,7 +2755,7 @@ FSTATIC RCODE verifyFirstChildLink(
{
if (ui64TmpRootId != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
goto Exit;
}
}
@@ -2754,14 +2763,14 @@ FSTATIC RCODE verifyFirstChildLink(
// Make sure this child has not been visited as a first child already.
if (pTmpRSEntry->hdr.ui16Flags & CHK_FIRST_CHILD_VERIFIED)
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
goto Exit;
}
// Does this child reference the correct parent?
if (getLinkVal( CHK_BM_PARENT_ID, pTmpRSEntry) != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
goto Exit;
}
@@ -2789,7 +2798,7 @@ FSTATIC RCODE verifyLastChildLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -2807,14 +2816,14 @@ FSTATIC RCODE verifyLastChildLink(
if (getLinkVal( CHK_BM_FIRST_CHILD, pRSEntry))
{
- *piErrCode = FLM_BAD_LAST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_LAST_CHILD_LINK;
}
if (pRSEntry->hdr.ui16Flags & CHK_PARENT_VERIFIED)
{
if( !getLinkVal( CHK_BM_ANNOTATION, pRSEntry))
{
- *piErrCode = FLM_BAD_FIRST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_FIRST_CHILD_LINK;
}
}
goto Exit;
@@ -2823,7 +2832,7 @@ FSTATIC RCODE verifyLastChildLink(
if (ui64LastChildId == pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_LAST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_LAST_CHILD_LINK;
goto Exit;
}
@@ -2834,7 +2843,7 @@ FSTATIC RCODE verifyLastChildLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_LAST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_LAST_CHILD_LINK;
goto Exit;
}
@@ -2844,7 +2853,7 @@ FSTATIC RCODE verifyLastChildLink(
{
if (ui64RootId != ui64TmpRootId)
{
- *piErrCode = FLM_BAD_LAST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_LAST_CHILD_LINK;
goto Exit;
}
}
@@ -2852,7 +2861,7 @@ FSTATIC RCODE verifyLastChildLink(
{
if (ui64TmpRootId != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_LAST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_LAST_CHILD_LINK;
goto Exit;
}
}
@@ -2860,14 +2869,14 @@ FSTATIC RCODE verifyLastChildLink(
// Make sure this child has not been visited as a last child already.
if (pTmpRSEntry->hdr.ui16Flags & CHK_LAST_CHILD_VERIFIED)
{
- *piErrCode = FLM_BAD_LAST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_LAST_CHILD_LINK;
goto Exit;
}
// Does this child reference the correct parent?
if (getLinkVal( CHK_BM_PARENT_ID, pTmpRSEntry) != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_LAST_CHILD_LINK;
+ *pi32ErrCode = FLM_BAD_LAST_CHILD_LINK;
goto Exit;
}
@@ -2896,7 +2905,7 @@ FSTATIC RCODE verifyPrevSiblingLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -2913,7 +2922,7 @@ FSTATIC RCODE verifyPrevSiblingLink(
// Should not be a Next Sibling to anyone.
if (pRSEntry->hdr.ui16Flags & CHK_NEXT_SIBLING_VERIFIED)
{
- *piErrCode = FLM_BAD_PREV_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_PREV_SIBLING_LINK;
}
// Must also verify that this node is the first child of the parent node
@@ -2928,7 +2937,7 @@ FSTATIC RCODE verifyPrevSiblingLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_PARENT_LINK;
+ *pi32ErrCode = FLM_BAD_PARENT_LINK;
goto Exit;
}
ui64FirstChild = getLinkVal( CHK_BM_FIRST_CHILD, pTmpRSEntry);
@@ -2941,7 +2950,7 @@ FSTATIC RCODE verifyPrevSiblingLink(
ui64Annot = getLinkVal( CHK_BM_ANNOTATION, pTmpRSEntry);
if (ui64Annot != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_PREV_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_PREV_SIBLING_LINK;
goto Exit;
}
}
@@ -2956,7 +2965,7 @@ FSTATIC RCODE verifyPrevSiblingLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_PREV_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_PREV_SIBLING_LINK;
goto Exit;
}
@@ -2967,7 +2976,7 @@ FSTATIC RCODE verifyPrevSiblingLink(
{
if( ui64ParentId || getLinkVal( CHK_BM_PARENT_ID, pTmpRSEntry))
{
- *piErrCode = FLM_BAD_PREV_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_PREV_SIBLING_LINK;
goto Exit;
}
}
@@ -2977,14 +2986,14 @@ FSTATIC RCODE verifyPrevSiblingLink(
if (pTmpRSEntry->hdr.ui16Flags & CHK_PREV_SIBLING_VERIFIED)
{
- *piErrCode = FLM_BAD_PREV_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_PREV_SIBLING_LINK;
goto Exit;
}
// Should point to "this" node.
if (getLinkVal( CHK_BM_NEXT_SIBLING, pTmpRSEntry) != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_PREV_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_PREV_SIBLING_LINK;
goto Exit;
}
@@ -3013,7 +3022,7 @@ FSTATIC RCODE verifyNextSiblingLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -3030,7 +3039,7 @@ FSTATIC RCODE verifyNextSiblingLink(
// Should not be a Prev Sibling to anyone.
if (pRSEntry->hdr.ui16Flags & CHK_PREV_SIBLING_VERIFIED)
{
- *piErrCode = FLM_BAD_NEXT_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_NEXT_SIBLING_LINK;
}
// Must also verify that this node is the last child of the parent node
// - if there is a parent.
@@ -3044,7 +3053,7 @@ FSTATIC RCODE verifyNextSiblingLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_PARENT_LINK;
+ *pi32ErrCode = FLM_BAD_PARENT_LINK;
goto Exit;
}
ui64LastChild = getLinkVal( CHK_BM_LAST_CHILD, pTmpRSEntry);
@@ -3057,7 +3066,7 @@ FSTATIC RCODE verifyNextSiblingLink(
ui64Annot = getLinkVal( CHK_BM_ANNOTATION, pTmpRSEntry);
if (ui64Annot != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_NEXT_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_NEXT_SIBLING_LINK;
goto Exit;
}
}
@@ -3074,7 +3083,7 @@ FSTATIC RCODE verifyNextSiblingLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_NEXT_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_NEXT_SIBLING_LINK;
goto Exit;
}
@@ -3085,7 +3094,7 @@ FSTATIC RCODE verifyNextSiblingLink(
{
if( ui64ParentId || getLinkVal( CHK_BM_PARENT_ID, pTmpRSEntry))
{
- *piErrCode = FLM_BAD_NEXT_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_NEXT_SIBLING_LINK;
goto Exit;
}
}
@@ -3095,7 +3104,7 @@ FSTATIC RCODE verifyNextSiblingLink(
if( pTmpRSEntry->hdr.ui16Flags & CHK_NEXT_SIBLING_VERIFIED)
{
- *piErrCode = FLM_BAD_NEXT_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_NEXT_SIBLING_LINK;
goto Exit;
}
@@ -3103,7 +3112,7 @@ FSTATIC RCODE verifyNextSiblingLink(
if( getLinkVal( CHK_BM_PREV_SIBLING, pTmpRSEntry) != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_NEXT_SIBLING_LINK;
+ *pi32ErrCode = FLM_BAD_NEXT_SIBLING_LINK;
goto Exit;
}
@@ -3130,7 +3139,7 @@ FSTATIC RCODE verifyAnnotationLink(
NODE_RS_ENTRY * pRSEntry,
NODE_RS_ENTRY * pTmpRSEntry,
F_BtResultSet * pResult,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -3154,7 +3163,7 @@ FSTATIC RCODE verifyAnnotationLink(
&uiKeySize, (FLMBYTE *)pTmpRSEntry, sizeof( NODE_RS_ENTRY),
&uiTmpRSEntrySize)))
{
- *piErrCode = FLM_BAD_ANNOTATION_LINK;
+ *pi32ErrCode = FLM_BAD_ANNOTATION_LINK;
goto Exit;
}
@@ -3169,7 +3178,7 @@ FSTATIC RCODE verifyAnnotationLink(
{
if (ui64RootId != ui64TmpRootId)
{
- *piErrCode = FLM_BAD_ANNOTATION_LINK;
+ *pi32ErrCode = FLM_BAD_ANNOTATION_LINK;
goto Exit;
}
}
@@ -3179,7 +3188,7 @@ FSTATIC RCODE verifyAnnotationLink(
if (ui64TmpRootId != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_ANNOTATION_LINK;
+ *pi32ErrCode = FLM_BAD_ANNOTATION_LINK;
goto Exit;
}
}
@@ -3187,14 +3196,14 @@ FSTATIC RCODE verifyAnnotationLink(
// The annotation should not have been visited as such before now.
if (pTmpRSEntry->hdr.ui16Flags & CHK_ANNOTATION_VERIFIED)
{
- *piErrCode = FLM_BAD_ANNOTATION_LINK;
+ *pi32ErrCode = FLM_BAD_ANNOTATION_LINK;
goto Exit;
}
// Parent should point to "this" node.
if (getLinkVal( CHK_BM_PARENT_ID, pTmpRSEntry) != pRSEntry->hdr.ui64NodeId)
{
- *piErrCode = FLM_BAD_ANNOTATION_LINK;
+ *pi32ErrCode = FLM_BAD_ANNOTATION_LINK;
goto Exit;
}
@@ -3225,7 +3234,7 @@ Desc: This routine does for chains of data-only blocks what verifySubTree
RCODE F_DbCheck::verifyDOChain(
STATE_INFO * pParentState,
FLMUINT uiBlkAddr,
- FLMINT * piElmErrCode)
+ FLMINT32 * pi32ElmErrCode)
{
RCODE rc = NE_XFLM_OK;
F_NodeVerifier * pNodeVerifier = pParentState->pNodeVerifier;
@@ -3246,7 +3255,7 @@ RCODE F_DbCheck::verifyDOChain(
// to data only blocks...
if (pParentState->uiLevel != 0)
{
- *piElmErrCode = FLM_BAD_ELM_INVALID_LEVEL;
+ *pi32ElmErrCode = FLM_BAD_ELM_INVALID_LEVEL;
rc = RC_SET_AND_ASSERT( NE_XFLM_FAILURE);
goto Exit;
}
@@ -3274,18 +3283,18 @@ RCODE F_DbCheck::verifyDOChain(
if (RC_BAD( rc = blkRead( uiBlkAddr,
&pBlkHdr,
&pSCache,
- piElmErrCode)))
+ pi32ElmErrCode)))
{
- if (*piElmErrCode)
+ if (*pi32ElmErrCode)
{
uiNumErrors++;
- chkReportError( *piElmErrCode,
+ chkReportError( *pi32ElmErrCode,
XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber,
- m_Progress.uiLfType,
- StateInfo.uiLevel,
- uiBlkAddr,
- uiParentBlkAddr,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)StateInfo.uiLevel,
+ (FLMUINT32)uiBlkAddr,
+ (FLMUINT32)uiParentBlkAddr,
0,
0);
}
@@ -3312,7 +3321,7 @@ RCODE F_DbCheck::verifyDOChain(
// Chains of data only blocks should always have at least 2 blocks...
if ((uiNumBlksRead == 0) && (pBlkHdr->ui32NextBlkInChain == 0))
{
- *piElmErrCode = FLM_BAD_DATA_BLOCK_COUNT;
+ *pi32ElmErrCode = FLM_BAD_DATA_BLOCK_COUNT;
rc = RC_SET_AND_ASSERT( NE_XFLM_FAILURE);
goto Exit;
}
@@ -3326,15 +3335,17 @@ RCODE F_DbCheck::verifyDOChain(
StateInfo.pBlkHdr = pBlkHdr;
StateInfo.uiBlkType = BT_DATA_ONLY;
StateInfo.ui32BlkAddress = (FLMUINT32)uiBlkAddr;
- *piElmErrCode = flmVerifyBlockHeader( &StateInfo, pBlkInfo, uiBlockSize,
+ *pi32ElmErrCode = flmVerifyBlockHeader( &StateInfo, pBlkInfo, uiBlockSize,
0xFFFFFFFF, (uiNumBlksRead > 1) ?
uiPrevNextBlkAddr : 0, TRUE);
- if (*piElmErrCode != 0)
+ if (*pi32ElmErrCode != 0)
{
uiNumErrors++;
- chkReportError( *piElmErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, StateInfo.uiLevel, uiBlkAddr,
- uiParentBlkAddr, 0, 0);
+ chkReportError( *pi32ElmErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)StateInfo.uiLevel, (FLMUINT32)uiBlkAddr,
+ (FLMUINT32)uiParentBlkAddr, 0, 0);
}
// Verify that the ui16BlkBytesAvail is a reasonable size...
@@ -3342,7 +3353,7 @@ RCODE F_DbCheck::verifyDOChain(
if( (pBlkHdr->ui32NextBlkInChain != 0) &&
(pBlkHdr->ui16BlkBytesAvail != 0))
{
- *piElmErrCode = FLM_BAD_AVAIL_SIZE;
+ *pi32ElmErrCode = FLM_BAD_AVAIL_SIZE;
rc = RC_SET_AND_ASSERT( NE_XFLM_FAILURE);
goto Exit;
}
@@ -3417,9 +3428,9 @@ RCODE F_DbCheck::verifySubTree(
FLMUINT uiParentBlkAddress;
FLMUINT uiChildBlkAddress;
FLMUINT uiPrevNextBlkAddress;
- FLMINT iElmErrCode;
- FLMINT iBlkErrCode = 0;
- FLMINT iLastErrCode = 0;
+ FLMINT32 i32ElmErrCode;
+ FLMINT32 i32BlkErrCode = 0;
+ FLMINT32 i32LastErrCode = 0;
FLMUINT uiNumErrors = 0;
FLMUINT64 ui64SaveKeyCount = 0;
FLMUINT64 ui64SaveKeyRefs = 0;
@@ -3429,7 +3440,7 @@ RCODE F_DbCheck::verifySubTree(
FLMBOOL bCountElm;
FLMBOOL bDescendToChildBlocks;
FLMINT iCompareStatus;
- FLMINT iHdrErrCode;
+ FLMINT32 i32HdrErrCode;
F_NodeVerifier * pNodeVerifier = pStateInfo->pNodeVerifier;
STATE_INFO * pChildStateInfo = NULL;
F_CachedBlock * pTmpSCache = NULL;
@@ -3448,30 +3459,31 @@ RCODE F_DbCheck::verifySubTree(
bDescendToChildBlocks = TRUE;
- if (RC_BAD( rc = blkRead( uiBlkAddress, &pBlkHdr, &pSCache, &iBlkErrCode)))
+ if (RC_BAD( rc = blkRead( uiBlkAddress, &pBlkHdr, &pSCache, &i32BlkErrCode)))
{
- if (iBlkErrCode)
+ if (i32BlkErrCode)
{
uiNumErrors++;
- iLastErrCode = iBlkErrCode;
+ i32LastErrCode = i32BlkErrCode;
- chkReportError( iBlkErrCode, XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber, m_Progress.uiLfType, uiLevel, uiBlkAddress,
- uiParentBlkAddress, 0, 0);
+ chkReportError( i32BlkErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber, (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)uiLevel, (FLMUINT32)uiBlkAddress,
+ (FLMUINT32)uiParentBlkAddress, 0, 0);
- if( iBlkErrCode == FLM_BAD_BLK_CHECKSUM)
+ if( i32BlkErrCode == FLM_BAD_BLK_CHECKSUM)
{
bDescendToChildBlocks = FALSE;
// Allow to continue the check, but if this is a non-leaf block
- // a non-zero iBlkErrCode will prevent us from descending to
+ // a non-zero i32BlkErrCode will prevent us from descending to
// child blocks. Set rc to SUCCESS so we won't goto Exit below.
rc = NE_XFLM_OK;
}
- else if (iBlkErrCode == FLM_COULD_NOT_SYNC_BLK)
+ else if (i32BlkErrCode == FLM_COULD_NOT_SYNC_BLK)
{
- iLastErrCode = iBlkErrCode;
+ i32LastErrCode = i32BlkErrCode;
// Need the goto here, because rc is changed to SUCCESS,
// and the goto below would get skipped.
@@ -3507,7 +3519,7 @@ RCODE F_DbCheck::verifySubTree(
// Check the block header.
- if ((iHdrErrCode =
+ if ((i32HdrErrCode =
flmVerifyBlockHeader( pStateInfo, pBlkInfo, uiBlockSize,
(pParentState == NULL)
? 0
@@ -3525,29 +3537,30 @@ RCODE F_DbCheck::verifySubTree(
uiPrevNextBlkAddress != uiBlkAddress &&
(uiResetKeyLen == ~(FLMUINT)0))
{
- iHdrErrCode = FLM_BAD_PREV_BLK_NEXT;
+ i32HdrErrCode = FLM_BAD_PREV_BLK_NEXT;
}
}
- if (iHdrErrCode != 0)
+ if (i32HdrErrCode != 0)
{
// Check to see if the previous block is still valid.
// It may be that the block has gone away, and so is no longer valid.
- if (iHdrErrCode == FLM_BAD_BLK_HDR_PREV)
+ if (i32HdrErrCode == FLM_BAD_BLK_HDR_PREV)
{
flmAssert( pParentState);
if (RC_BAD( rc = blkRead( pParentState->ui32LastChildAddr,
- &pTmpBlkHdr, &pTmpSCache, &iBlkErrCode)))
+ &pTmpBlkHdr, &pTmpSCache, &i32BlkErrCode)))
{
- iLastErrCode = iBlkErrCode;
+ i32LastErrCode = i32BlkErrCode;
uiNumErrors++;
- chkReportError( iBlkErrCode, XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber, m_Progress.uiLfType, uiLevel,
- uiBlkAddress, uiParentBlkAddress, 0, 0);
+ chkReportError( i32BlkErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber, (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)uiLevel,
+ (FLMUINT32)uiBlkAddress, (FLMUINT32)uiParentBlkAddress, 0, 0);
}
else
{
@@ -3557,24 +3570,27 @@ RCODE F_DbCheck::verifySubTree(
if (pTmpBlkHdr->ui8BlkType == BT_FREE)
{
- iHdrErrCode = 0;
+ i32HdrErrCode = 0;
}
else
{
- iLastErrCode = iHdrErrCode;
+ i32LastErrCode = i32HdrErrCode;
uiNumErrors++;
- chkReportError( iHdrErrCode, XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber, m_Progress.uiLfType, uiLevel,
- uiBlkAddress, uiParentBlkAddress, 0, 0);
+ chkReportError( i32HdrErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, (FLMUINT32)uiLevel,
+ (FLMUINT32)uiBlkAddress, (FLMUINT32)uiParentBlkAddress, 0, 0);
}
}
}
else
{
- iLastErrCode = iHdrErrCode;
+ i32LastErrCode = i32HdrErrCode;
uiNumErrors++;
- chkReportError( iHdrErrCode, XFLM_LOCALE_B_TREE, m_Progress.uiLfNumber,
- m_Progress.uiLfType, uiLevel, uiBlkAddress, uiParentBlkAddress,
+ chkReportError( i32HdrErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber,
+ (FLMUINT32)m_Progress.ui32LfType, (FLMUINT32)uiLevel,
+ (FLMUINT32)uiBlkAddress, (FLMUINT32)uiParentBlkAddress,
0, 0);
}
@@ -3593,7 +3609,7 @@ RCODE F_DbCheck::verifySubTree(
{
if (rc == NE_XFLM_BTREE_ERROR)
{
- iBlkErrCode = FLM_BAD_BLOCK_STRUCTURE;
+ i32BlkErrCode = FLM_BAD_BLOCK_STRUCTURE;
rc = NE_XFLM_OK;
goto fix_state;
}
@@ -3631,17 +3647,18 @@ RCODE F_DbCheck::verifySubTree(
// Verify the element first, then check if we are restting...
m_LastStatusRc = flmVerifyElement( pStateInfo, m_pLFile, m_pIxd,
- &iElmErrCode);
- if (iElmErrCode)
+ &i32ElmErrCode);
+ if (i32ElmErrCode)
{
// Report any errors in the element.
- iLastErrCode = iElmErrCode;
+ i32LastErrCode = i32ElmErrCode;
uiNumErrors++;
- if (RC_BAD( rc = chkReportError( iElmErrCode, XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber, m_Progress.uiLfType, uiLevel, uiBlkAddress,
- uiParentBlkAddress, pStateInfo->uiElmOffset,
+ if (RC_BAD( rc = chkReportError( i32ElmErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber, (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)uiLevel, (FLMUINT32)uiBlkAddress,
+ (FLMUINT32)uiParentBlkAddress, (FLMUINT32)pStateInfo->uiElmOffset,
pStateInfo->ui64ElmNodeId)))
{
break;
@@ -3751,7 +3768,7 @@ RCODE F_DbCheck::verifySubTree(
// Do some further checking.
- if (iElmErrCode == 0)
+ if (i32ElmErrCode == 0)
{
if (bProcessElm &&
(uiBlkType == BT_LEAF_DATA ||
@@ -3769,7 +3786,7 @@ RCODE F_DbCheck::verifySubTree(
flmAssert( pStateInfo->uiElmDataLen == 4);
if( RC_BAD( rc = verifyDOChain( pStateInfo,
- FB2UD( pStateInfo->pucElmData), &iElmErrCode)))
+ FB2UD( pStateInfo->pucElmData), &i32ElmErrCode)))
{
goto Exit;
}
@@ -3823,7 +3840,7 @@ RCODE F_DbCheck::verifySubTree(
m_pDb, m_pDb->m_pDict,
pStateInfo->pCollection->lfInfo.uiLfNum,
pStateInfo->ui64ElmNodeId, m_bSkipDOMLinkCheck,
- &iElmErrCode)))
+ &i32ElmErrCode)))
{
goto Exit;
}
@@ -3833,16 +3850,18 @@ RCODE F_DbCheck::verifySubTree(
if (bProcessElm)
{
- if (iElmErrCode != 0)
+ if (i32ElmErrCode != 0)
{
// Report any errors in the element.
- iLastErrCode = iElmErrCode;
+ i32LastErrCode = i32ElmErrCode;
uiNumErrors++;
- chkReportError( iElmErrCode, XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber, m_Progress.uiLfType, uiLevel,
- uiBlkAddress, uiParentBlkAddress, pStateInfo->uiElmOffset,
+ chkReportError( i32ElmErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber, (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)uiLevel,
+ (FLMUINT32)uiBlkAddress, (FLMUINT32)uiParentBlkAddress,
+ (FLMUINT32)pStateInfo->uiElmOffset,
pStateInfo->ui64ElmNodeId);
if (RC_BAD( m_LastStatusRc))
@@ -3936,7 +3955,7 @@ RCODE F_DbCheck::verifySubTree(
// Verify that the last key in the block matches the parent's key.
- if (iLastErrCode == 0 && pParentState && RC_OK( m_LastStatusRc))
+ if (i32LastErrCode == 0 && pParentState && RC_OK( m_LastStatusRc))
{
if (pStateInfo->bValidKey && pParentState->bValidKey &&
f_memcmp( pStateInfo->pucElmKey,
@@ -3945,12 +3964,13 @@ RCODE F_DbCheck::verifySubTree(
? pStateInfo->uiElmKeyLen
: pParentState->uiElmKeyLen) != 0)
{
- iLastErrCode = FLM_BAD_PARENT_KEY;
+ i32LastErrCode = FLM_BAD_PARENT_KEY;
uiNumErrors++;
- chkReportError( iLastErrCode, XFLM_LOCALE_B_TREE,
- m_Progress.uiLfNumber, m_Progress.uiLfType, uiLevel, uiBlkAddress,
- uiParentBlkAddress, 0, 0);
+ chkReportError( i32LastErrCode, XFLM_LOCALE_B_TREE,
+ (FLMUINT32)m_Progress.ui32LfNumber, (FLMUINT32)m_Progress.ui32LfType,
+ (FLMUINT32)uiLevel, (FLMUINT32)uiBlkAddress,
+ (FLMUINT32)uiParentBlkAddress, 0, 0);
}
}
@@ -3960,9 +3980,9 @@ fix_state:
// address and last child address to zero to indicate that we really
// aren't sure we're at the right place in this level in the B-TREE.
- if (iLastErrCode != 0)
+ if (i32LastErrCode != 0)
{
- pStateInfo->BlkInfo.iErrCode = iLastErrCode;
+ pStateInfo->BlkInfo.i32ErrCode = i32LastErrCode;
pStateInfo->BlkInfo.uiNumErrors += uiNumErrors;
// Reset all child block states.
@@ -4406,7 +4426,7 @@ RCODE F_NodeVerifier::finalize(
FLMUINT uiCollection,
FLMUINT64 ui64NodeId,
FLMBOOL bSkipDOMLinkCheck,
- FLMINT * piElmErrCodeRV)
+ FLMINT32 * pi32ElmErrCodeRV)
{
RCODE rc = NE_XFLM_OK;
NODE_RS_ENTRY * pRSEntry = NULL;
@@ -4415,7 +4435,7 @@ RCODE F_NodeVerifier::finalize(
F_NameTable * pNameTable = pDict->getNameTable();
IF_BufferIStream * pBufferStream = NULL;
- *piElmErrCodeRV = 0;
+ *pi32ElmErrCodeRV = 0;
if( m_bFinalizeCalled)
{
@@ -4450,7 +4470,7 @@ RCODE F_NodeVerifier::finalize(
if( m_nodeInfo.eNodeType != ELEMENT_NODE)
{
- *piElmErrCodeRV = FLM_BAD_NODE_TYPE;
+ *pi32ElmErrCodeRV = FLM_BAD_NODE_TYPE;
goto Exit;
}
@@ -4460,7 +4480,7 @@ RCODE F_NodeVerifier::finalize(
{
if( !(uiStorageFlags & NSF_HAVE_CHILDREN_BIT))
{
- *piElmErrCodeRV = FLM_BAD_CHILD_ELM_COUNT;
+ *pi32ElmErrCodeRV = FLM_BAD_CHILD_ELM_COUNT;
goto Exit;
}
}
@@ -4469,23 +4489,23 @@ RCODE F_NodeVerifier::finalize(
// Verify the Name and Prefix Ids.
if( RC_BAD( rc = verifyNameId( pDb, m_nodeInfo.eNodeType,
- m_nodeInfo.uiNameId, pNameTable, piElmErrCodeRV)))
+ m_nodeInfo.uiNameId, pNameTable, pi32ElmErrCodeRV)))
{
goto Exit;
}
- if( *piElmErrCodeRV)
+ if( *pi32ElmErrCodeRV)
{
goto Exit;
}
if( RC_BAD( rc = verifyPrefixId( pDb,
- m_nodeInfo.uiPrefixId, pNameTable, piElmErrCodeRV)))
+ m_nodeInfo.uiPrefixId, pNameTable, pi32ElmErrCodeRV)))
{
goto Exit;
}
- if( *piElmErrCodeRV)
+ if( *pi32ElmErrCodeRV)
{
goto Exit;
}
@@ -4555,7 +4575,7 @@ RCODE F_NodeVerifier::finalize(
sizeof( FLMUINT64), (FLMBYTE *)pRSEntry,
sizeof( NODE_RS_HDR) + (uiRSBufIndex * sizeof( FLMUINT64)))))
{
- *piElmErrCodeRV = -1;
+ *pi32ElmErrCodeRV = -1;
goto Exit;
}
}
@@ -4793,7 +4813,7 @@ RCODE F_NodeVerifier::verifyNameId(
eDomNodeType eNodeType,
FLMUINT uiNameId,
F_NameTable * pNameTable,
- FLMINT * piErrCode)
+ FLMINT32 * pi32ErrCode)
{
RCODE rc = NE_XFLM_OK;
FLMUINT uiType;
@@ -4824,7 +4844,7 @@ RCODE F_NodeVerifier::verifyNameId(
default:
{
flmAssert( 0);
- *piErrCode = FLM_UNSUPPORTED_NODE_TYPE;
+ *pi32ErrCode = FLM_UNSUPPORTED_NODE_TYPE;
goto Exit;
}
}
@@ -4832,7 +4852,7 @@ RCODE F_NodeVerifier::verifyNameId(
if (RC_BAD( rc = pNameTable->getFromTagTypeAndNum( pDb, uiType,
uiNameId, NULL, NULL, &uiLen, NULL, NULL, NULL, NULL, TRUE)))
{
- *piErrCode = FLM_BAD_INVALID_NAME_ID;
+ *pi32ErrCode = FLM_BAD_INVALID_NAME_ID;
goto Exit;
}
@@ -4849,7 +4869,7 @@ RCODE F_NodeVerifier::verifyPrefixId(
F_Db * pDb,
FLMUINT uiPrefixId,
F_NameTable * pNameTable,
- FLMINT * piErrCode
+ FLMINT32 * pi32ErrCode
)
{
RCODE rc = NE_XFLM_OK;
@@ -4863,7 +4883,7 @@ RCODE F_NodeVerifier::verifyPrefixId(
if (RC_BAD( rc = pNameTable->getFromTagTypeAndNum(
pDb, ELM_PREFIX_TAG, uiPrefixId, NULL, NULL, &uiLen)))
{
- *piErrCode = FLM_BAD_INVALID_PREFIX_ID;
+ *pi32ErrCode = FLM_BAD_INVALID_PREFIX_ID;
goto Exit;
}
diff --git a/xflaim/src/xflaim.h b/xflaim/src/xflaim.h
index 1fa7057..1dd669a 100644
--- a/xflaim/src/xflaim.h
+++ b/xflaim/src/xflaim.h
@@ -96,9 +96,9 @@
#define XFLM_DEFAULT_MIN_RFL_FILE_SIZE ((FLMUINT)100 * (FLMUINT)1024 * (FLMUINT)1024)
FLMUINT32 ui32MaxRflFileSize;
#define XFLM_DEFAULT_MAX_RFL_FILE_SIZE FLM_MAXIMUM_FILE_SIZE
- FLMINT32 i32KeepRflFiles;
+ FLMBOOL bKeepRflFiles;
#define XFLM_DEFAULT_KEEP_RFL_FILES_FLAG FALSE
- FLMINT32 i32LogAbortedTransToRfl;
+ FLMBOOL bLogAbortedTransToRfl;
#define XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG FALSE
FLMUINT32 ui32DefaultLanguage;
@@ -737,12 +737,14 @@
} XFLM_INDEX_STATUS;
/****************************************************************************
- Desc: The following structures are used to pass data to the client via the
- IF_DbRebuildStatus interface
+ Desc: The following structures are used to pass data to the client via the
+ IF_DbRebuildStatus interface
+ IMPORTANT NOTE: If this structure changes, corresponding changes need
+ to be made to the same structure in java and/or C# code.
****************************************************************************/
typedef struct
{
- FLMINT iDoingFlag;
+ FLMINT32 i32DoingFlag;
#define REBUILD_GET_BLK_SIZ 1
#define REBUILD_RECOVER_DICT 2
#define REBUILD_RECOVER_DATA 3
@@ -755,30 +757,32 @@
} XFLM_REBUILD_INFO;
// IMPORTANT NOTE: If this structure changes, corresponding changes need to be made
- // to the same structure in DbSystem.cs for C#.
+ // to the same structure in java and/or C# code
typedef struct
{
- FLMINT iErrCode; // Zero means no error is being reported
- FLMUINT uiErrLocale;
+ FLMINT32 i32ErrCode; // Zero means no error is being reported
+ FLMUINT32 ui32ErrLocale;
#define XFLM_LOCALE_NONE 0
#define XFLM_LOCALE_LFH_LIST 1
#define XFLM_LOCALE_AVAIL_LIST 2
#define XFLM_LOCALE_B_TREE 3
#define XFLM_LOCALE_INDEX 4
- FLMUINT uiErrLfNumber;
- FLMUINT uiErrLfType;
- FLMUINT uiErrBTreeLevel;
- FLMUINT uiErrBlkAddress;
- FLMUINT uiErrParentBlkAddress;
- FLMUINT uiErrElmOffset;
+ FLMUINT32 ui32ErrLfNumber;
+ FLMUINT32 ui32ErrLfType;
+ FLMUINT32 ui32ErrBTreeLevel;
+ FLMUINT32 ui32ErrBlkAddress;
+ FLMUINT32 ui32ErrParentBlkAddress;
+ FLMUINT32 ui32ErrElmOffset;
FLMUINT64 ui64ErrNodeId;
IF_DataVector * ifpErrIxKey;
} XFLM_CORRUPT_INFO;
+ // IMPORTANT NOTE: If this structure changes, corresponding changes need to be made
+ // to the same structure in java and/or C# code
typedef struct
{
- FLMINT iCheckPhase;
+ FLMINT32 i32CheckPhase;
#define XFLM_CHECK_LFH_BLOCKS 1
#define XFLM_CHECK_B_TREE 2
#define XFLM_CHECK_AVAIL_BLOCKS 3
@@ -786,12 +790,12 @@
#define XFLM_CHECK_DOM_LINKS 5
FLMBOOL bStartFlag;
FLMUINT64 ui64FileSize;
- FLMUINT uiNumLFs;
- FLMUINT uiCurrLF;
- FLMUINT uiLfNumber; /* Logical File Pass */
- FLMUINT uiLfType;
+ FLMUINT32 ui32NumLFs;
+ FLMUINT32 ui32CurrLF;
+ FLMUINT32 ui32LfNumber; /* Logical File Pass */
+ FLMUINT32 ui32LfType;
FLMUINT64 ui64BytesExamined;
- FLMUINT uiNumProblemsFixed; /* Number of corruptions repaired */
+ FLMUINT32 ui32NumProblemsFixed; /* Number of corruptions repaired */
FLMUINT64 ui64NumDomNodes; /* in the current Lf */
FLMUINT64 ui64NumDomLinksVerified; /* in the current Lf */
FLMUINT64 ui64NumBrokenDomLinks; /* in the current Lf */
@@ -3955,13 +3959,13 @@
virtual void FLMAPI getAvailBlockStats(
FLMUINT64 * pui64BytesUsed,
FLMUINT * puiBlockCount,
- FLMINT * piLastError,
+ FLMINT32 * pi32LastError,
FLMUINT * puiNumErrors) = 0;
virtual void FLMAPI getLFHBlockStats(
FLMUINT64 * pui64BytesUsed,
FLMUINT * puiBlockCount,
- FLMINT * piLastError,
+ FLMINT32 * pi32LastError,
FLMUINT * puiNumErrors) = 0;
virtual void FLMAPI getBTreeInfo(
@@ -3980,7 +3984,7 @@
FLMUINT64 * pui64ContElementCount,
FLMUINT64 * pui64ContElmBytes,
FLMUINT * puiBlockCount,
- FLMINT * piLastError,
+ FLMINT32 * pi32LastError,
FLMUINT * puiNumErrors) = 0;
};
diff --git a/xflaim/util/checkdb.cpp b/xflaim/util/checkdb.cpp
index 890e5c3..98b8edd 100644
--- a/xflaim/util/checkdb.cpp
+++ b/xflaim/util/checkdb.cpp
@@ -157,7 +157,7 @@ FSTATIC void OutOneBlockStat(
FLMUINT64 ui64ContElementCount,
FLMUINT64 ui64ContElmBytes,
FLMUINT uiBlockCount,
- FLMINT iLastError,
+ FLMINT32 i32LastError,
FLMUINT uiNumErrors);
FSTATIC void OutLogicalFile(
@@ -1143,7 +1143,7 @@ FSTATIC void OutOneBlockStat(
FLMUINT64 ui64ContElementCount,
FLMUINT64 ui64ContElmBytes,
FLMUINT uiBlockCount,
- FLMINT iLastError,
+ FLMINT32 i32LastError,
FLMUINT uiNumErrors)
{
char szTmpBuf[ 100];
@@ -1217,7 +1217,7 @@ FSTATIC void OutOneBlockStat(
{
f_strcpy( szTmpBuf, " LAST ERROR: ");
f_strcpy( &szTmpBuf[ f_strlen( szTmpBuf)],
- gv_pDbSystem->checkErrorToStr( iLastError));
+ gv_pDbSystem->checkErrorToStr( (FLMINT)i32LastError));
OutLine( szTmpBuf);
f_sprintf( szTmpBuf,
" TOTAL ERRORS: %u", (unsigned)uiNumErrors);
@@ -1246,7 +1246,7 @@ FSTATIC void OutLogicalFile(
FLMUINT64 ui64ContElementCount;
FLMUINT64 ui64ContElmBytes;
FLMUINT uiBlockCount;
- FLMINT iLastError;
+ FLMINT32 i32LastError;
FLMUINT uiNumErrors;
pDbInfo->getBTreeInfo( uiIndex, &uiLfNum, &eLfType,
@@ -1288,11 +1288,11 @@ FSTATIC void OutLogicalFile(
&ui64KeyCount, &ui64BytesUsed,
&ui64ElementCount, &ui64ContElementCount,
&ui64ContElmBytes, &uiBlockCount,
- &iLastError, &uiNumErrors);
+ &i32LastError, &uiNumErrors);
OutOneBlockStat( szTmpBuf,
pDbInfo->getDbHdr()->ui16BlockSize, ui64KeyCount,
ui64BytesUsed, ui64ElementCount, ui64ContElementCount,
- ui64ContElmBytes, uiBlockCount, iLastError, uiNumErrors);
+ ui64ContElmBytes, uiBlockCount, i32LastError, uiNumErrors);
}
}
}
@@ -1311,7 +1311,7 @@ FSTATIC void PrintInfo(
FLMUINT64 ui64ContElementCount;
FLMUINT64 ui64ContElmBytes;
FLMUINT uiBlockCount;
- FLMINT iLastError;
+ FLMINT32 i32LastError;
FLMUINT uiNumErrors;
const XFLM_DB_HDR * pDbHdr = pDbInfo->getDbHdr();
@@ -1337,26 +1337,26 @@ FSTATIC void PrintInfo(
ui64ContElementCount = 0;
ui64ContElmBytes = 0;
pDbInfo->getAvailBlockStats( &ui64BytesUsed, &uiBlockCount,
- &iLastError, &uiNumErrors);
+ &i32LastError, &uiNumErrors);
if( uiBlockCount)
{
OutOneBlockStat( " Avail",
(FLMUINT)pDbHdr->ui16BlockSize,
0, ui64BytesUsed, ui64ElementCount, ui64ContElementCount,
- ui64ContElmBytes, uiBlockCount, iLastError, uiNumErrors);
+ ui64ContElmBytes, uiBlockCount, i32LastError, uiNumErrors);
}
ui64ElementCount = 0;
ui64ContElementCount = 0;
ui64ContElmBytes = 0;
pDbInfo->getLFHBlockStats( &ui64BytesUsed, &uiBlockCount,
- &iLastError, &uiNumErrors);
+ &i32LastError, &uiNumErrors);
if( uiBlockCount)
{
OutOneBlockStat( " LFH",
(FLMUINT)pDbHdr->ui16BlockSize,
0, ui64BytesUsed, ui64ElementCount, ui64ContElementCount,
- ui64ContElmBytes, uiBlockCount, iLastError, uiNumErrors);
+ ui64ContElmBytes, uiBlockCount, i32LastError, uiNumErrors);
}
uiNumLogicalFiles = pDbInfo->getNumLogicalFiles();
@@ -1588,10 +1588,10 @@ RCODE F_LocalCheckStatus::reportProgress(
DisplayNumValue( DOM_LINKS_VERIFIED_ROW, pProgCheck->ui64NumDomLinksVerified);
DisplayNumValue( TOTAL_BROKEN_LINKS_ROW, pProgCheck->ui64NumBrokenDomLinks);
- DisplayNumValue( REPAIR_ROW, pProgCheck->uiNumProblemsFixed);
- gv_uiRepairCount = pProgCheck->uiNumProblemsFixed;
+ DisplayNumValue( REPAIR_ROW, pProgCheck->ui32NumProblemsFixed);
+ gv_uiRepairCount = (FLMUINT)pProgCheck->ui32NumProblemsFixed;
- if( pProgCheck->iCheckPhase != XFLM_CHECK_RS_SORT)
+ if( pProgCheck->i32CheckPhase != XFLM_CHECK_RS_SORT)
{
OutLabel( LABEL_COLUMN, AMOUNT_DONE_ROW, "Bytes Checked",
NULL, gv_ui64BytesDone, FALSE);
@@ -1602,36 +1602,36 @@ RCODE F_LocalCheckStatus::reportProgress(
gv_ui64FileSize = pProgCheck->ui64FileSize;
DisplayNumValue( FILE_SIZE_ROW, gv_ui64FileSize);
- switch( pProgCheck->iCheckPhase)
+ switch( pProgCheck->i32CheckPhase)
{
case XFLM_CHECK_LFH_BLOCKS:
f_strcpy( szWhat, "LFH BLOCKS");
break;
case XFLM_CHECK_B_TREE:
*szLfName = '\0';
- if( pProgCheck->uiLfType == XFLM_LF_INDEX)
+ if( pProgCheck->ui32LfType == XFLM_LF_INDEX)
{
f_strcpy( szWhat, "INDEX: ");
- (void)NumToName( pProgCheck->uiLfNumber,
+ (void)NumToName( pProgCheck->ui32LfNumber,
ELM_INDEX_TAG, szLfName);
}
- else if( pProgCheck->uiLfType == XFLM_LF_COLLECTION)
+ else if( pProgCheck->ui32LfType == XFLM_LF_COLLECTION)
{
f_strcpy( szWhat, "COLLECTION: ");
- (void)NumToName( pProgCheck->uiLfNumber,
+ (void)NumToName( pProgCheck->ui32LfNumber,
ELM_COLLECTION_TAG, szLfName);
}
else
{
f_strcpy( szWhat, "DICTIONARY: ");
- (void)NumToName( pProgCheck->uiLfNumber,
+ (void)NumToName( pProgCheck->ui32LfNumber,
ELM_INDEX_TAG, szLfName);
}
f_strcpy( &szWhat[ f_strlen( szWhat)], szLfName);
f_sprintf( &szWhat[ f_strlen( szWhat)], " (%u)",
- (unsigned)pProgCheck->uiLfNumber);
+ (unsigned)pProgCheck->ui32LfNumber);
szWhat[ 50] = '\0';
break;
case XFLM_CHECK_AVAIL_BLOCKS:
@@ -1642,11 +1642,11 @@ RCODE F_LocalCheckStatus::reportProgress(
break;
case XFLM_CHECK_DOM_LINKS:
f_strcpy( szWhat, "COLLECTION: ");
- (void)NumToName( pProgCheck->uiLfNumber,
+ (void)NumToName( pProgCheck->ui32LfNumber,
ELM_COLLECTION_TAG, szLfName);
f_strcpy( &szWhat[ f_strlen( szWhat)], szLfName);
f_sprintf( &szWhat[ f_strlen( szWhat)], " (%u)",
- (unsigned)pProgCheck->uiLfNumber);
+ (unsigned)pProgCheck->ui32LfNumber);
szWhat[ 50] = '\0';
break;
default:
@@ -1688,13 +1688,13 @@ RCODE F_LocalCheckStatus::reportCheckErr(
if( (gv_bLoggingEnabled) &&
((gv_bShowStats) ||
- (pCorruptInfo->iErrCode != FLM_OLD_VIEW)))
+ (pCorruptInfo->i32ErrCode != FLM_OLD_VIEW)))
{
LogCorruptError( pCorruptInfo);
}
f_conSetBackFore( FLM_BLUE, FLM_WHITE);
- if( pCorruptInfo->iErrCode == FLM_OLD_VIEW)
+ if( pCorruptInfo->i32ErrCode == FLM_OLD_VIEW)
{
gv_uiOldViewCount++;
DisplayNumValue( OLD_VIEW_ROW, gv_uiOldViewCount);
@@ -1746,7 +1746,7 @@ FSTATIC void LogCorruptError(
char szWhat[ 20];
char szTmpBuf[ 100];
- switch( pCorrupt->uiErrLocale)
+ switch( pCorrupt->ui32ErrLocale)
{
case XFLM_LOCALE_LFH_LIST:
{
@@ -1762,7 +1762,7 @@ FSTATIC void LogCorruptError(
case XFLM_LOCALE_B_TREE:
{
- if( pCorrupt->iErrCode == FLM_OLD_VIEW)
+ if( pCorrupt->i32ErrCode == FLM_OLD_VIEW)
{
LogStr( 0, "OLD VIEW");
}
@@ -1772,11 +1772,11 @@ FSTATIC void LogCorruptError(
{
f_strcpy( szWhat, "NODE");
}
- else if( pCorrupt->uiErrElmOffset)
+ else if( pCorrupt->ui32ErrElmOffset)
{
f_strcpy( szWhat, "ELEMENT");
}
- else if( pCorrupt->uiErrBlkAddress)
+ else if( pCorrupt->ui32ErrBlkAddress)
{
f_strcpy( szWhat, "BLOCK");
}
@@ -1791,10 +1791,10 @@ FSTATIC void LogCorruptError(
// Log the logical file number, name, and type
f_sprintf( szTmpBuf, "Logical File Number: %u",
- (unsigned)pCorrupt->uiErrLfNumber);
+ (unsigned)pCorrupt->ui32ErrLfNumber);
LogStr( 2, szTmpBuf);
- switch( pCorrupt->uiErrLfType)
+ switch( pCorrupt->ui32ErrLfType)
{
case XFLM_LF_COLLECTION:
{
@@ -1811,7 +1811,7 @@ FSTATIC void LogCorruptError(
default:
{
f_sprintf( szWhat, "?%u",
- (unsigned)pCorrupt->uiErrLfType);
+ (unsigned)pCorrupt->ui32ErrLfType);
break;
}
}
@@ -1821,10 +1821,10 @@ FSTATIC void LogCorruptError(
// Log the level in the B-Tree, if known
- if( pCorrupt->uiErrBTreeLevel != 0xFF)
+ if( pCorrupt->ui32ErrBTreeLevel != 0xFF)
{
f_sprintf( szTmpBuf, "Level in B-Tree: %u",
- (unsigned)pCorrupt->uiErrBTreeLevel);
+ (unsigned)pCorrupt->ui32ErrBTreeLevel);
LogStr( 2, szTmpBuf);
}
@@ -1840,30 +1840,30 @@ FSTATIC void LogCorruptError(
default:
{
- pCorrupt->uiErrLocale = 0;
+ pCorrupt->ui32ErrLocale = 0;
break;
}
}
// Log the block address, if known
- if( pCorrupt->uiErrBlkAddress)
+ if( pCorrupt->ui32ErrBlkAddress)
{
f_sprintf( szTmpBuf, "Block Address: 0x%08X (%u)",
- (unsigned)pCorrupt->uiErrBlkAddress,
- (unsigned)pCorrupt->uiErrBlkAddress);
+ (unsigned)pCorrupt->ui32ErrBlkAddress,
+ (unsigned)pCorrupt->ui32ErrBlkAddress);
LogStr( 2, szTmpBuf);
}
// Log the parent block address, if known
- if( pCorrupt->uiErrParentBlkAddress)
+ if( pCorrupt->ui32ErrParentBlkAddress)
{
- if( pCorrupt->uiErrParentBlkAddress != 0xFFFFFFFF)
+ if( pCorrupt->ui32ErrParentBlkAddress != FLM_MAX_UINT32)
{
f_sprintf( szTmpBuf, "Parent Block Address: 0x%08X (%u)",
- (unsigned)pCorrupt->uiErrParentBlkAddress,
- (unsigned)pCorrupt->uiErrParentBlkAddress);
+ (unsigned)pCorrupt->ui32ErrParentBlkAddress,
+ (unsigned)pCorrupt->ui32ErrParentBlkAddress);
}
else
{
@@ -1875,10 +1875,10 @@ FSTATIC void LogCorruptError(
// Log the element offset, if known
- if( pCorrupt->uiErrElmOffset != (FLMUINT)~(0))
+ if( pCorrupt->ui32ErrElmOffset != FLM_MAX_UINT32)
{
f_sprintf( szTmpBuf, "Element Offset: %u",
- (unsigned)pCorrupt->uiErrElmOffset);
+ (unsigned)pCorrupt->ui32ErrElmOffset);
LogStr( 2, szTmpBuf);
}
@@ -1891,9 +1891,9 @@ FSTATIC void LogCorruptError(
LogStr( 2, szTmpBuf);
}
- f_strcpy( szTmpBuf, gv_pDbSystem->checkErrorToStr( pCorrupt->iErrCode));
+ f_strcpy( szTmpBuf, gv_pDbSystem->checkErrorToStr( (FLMINT)pCorrupt->i32ErrCode));
f_sprintf( &szTmpBuf[ f_strlen( szTmpBuf)], " (%d)",
- (int)pCorrupt->iErrCode);
+ (int)pCorrupt->i32ErrCode);
LogStr( 2, szTmpBuf);
LogStr( 0, NULL);
@@ -1917,7 +1917,7 @@ FSTATIC void LogKeyError(
char szTmpBuf[ 200];
FLMUINT uiElementNumber;
- (void)NumToName( pCorrupt->uiErrLfNumber, ELM_INDEX_TAG, szNameBuf);
+ (void)NumToName( (FLMUINT)pCorrupt->ui32ErrLfNumber, ELM_INDEX_TAG, szNameBuf);
LogString( NULL);
LogString( NULL);
diff --git a/xflaim/util/rebuild.cpp b/xflaim/util/rebuild.cpp
index ef3bd3c..0cca54e 100644
--- a/xflaim/util/rebuild.cpp
+++ b/xflaim/util/rebuild.cpp
@@ -125,7 +125,7 @@ FLMBOOL gv_bShutdown = FALSE;
static char * gv_pszLogBuffer = NULL;
static FLMUINT gv_uiLogBufferCount = 0;
static FLMBOOL gv_bBatchMode;
-static FLMINT gv_iLastDoing;
+static FLMINT32 gv_i32LastDoing;
static FLMUINT64 gv_ui64BytesDone;
static FLMUINT64 gv_ui64TotalNodes;
static FLMUINT64 gv_ui64NodesRecovered;
@@ -243,7 +243,7 @@ FSTATIC FLMBOOL bldDoRebuild( void)
gv_ui64BytesDone = 0;
gv_ui64DictNodesRecovered = 0;
gv_ui64DiscardedDocs = 0;
- gv_iLastDoing = -1;
+ gv_i32LastDoing = -1;
gv_ui64TotalNodes = 0;
gv_ui64NodesRecovered = 0;
@@ -522,8 +522,8 @@ FSTATIC FLMBOOL bldGetParams(
gv_DefaultCreateOpts.ui32BlockSize = XFLM_DEFAULT_BLKSIZ;
gv_DefaultCreateOpts.ui32MinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE;
gv_DefaultCreateOpts.ui32MaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE;
- gv_DefaultCreateOpts.i32KeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG;
- gv_DefaultCreateOpts.i32LogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG;
+ gv_DefaultCreateOpts.bKeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG;
+ gv_DefaultCreateOpts.bLogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG;
gv_DefaultCreateOpts.ui32DefaultLanguage = XFLM_DEFAULT_LANG;
gv_DefaultCreateOpts.ui32VersionNum = XFLM_CURRENT_VERSION_NUM;
gv_uiCacheSize = 30000;
@@ -1010,35 +1010,35 @@ FSTATIC void bldLogCorruptError(
bldLogString( NULL);
bldLogString( "ERROR IN DATABASE");
f_sprintf( szBuf, "Collection Number: %u",
- (unsigned)pCorruptInfo->uiErrLfNumber);
+ (unsigned)pCorruptInfo->ui32ErrLfNumber);
bldLogStr( 2, szBuf);
// Log the block address, if known
- if (pCorruptInfo->uiErrBlkAddress)
+ if (pCorruptInfo->ui32ErrBlkAddress)
{
f_sprintf( szBuf, "Block Address: 0x%08X (%u)",
- (unsigned)pCorruptInfo->uiErrBlkAddress,
- (unsigned)pCorruptInfo->uiErrBlkAddress);
+ (unsigned)pCorruptInfo->ui32ErrBlkAddress,
+ (unsigned)pCorruptInfo->ui32ErrBlkAddress);
bldLogStr( 2, szBuf);
}
// Log the parent block address, if known
- if (pCorruptInfo->uiErrParentBlkAddress)
+ if (pCorruptInfo->ui32ErrParentBlkAddress)
{
f_sprintf( szBuf, "Parent Block Address: 0x%08X (%u)",
- (unsigned)pCorruptInfo->uiErrParentBlkAddress,
- (unsigned)pCorruptInfo->uiErrParentBlkAddress);
+ (unsigned)pCorruptInfo->ui32ErrParentBlkAddress,
+ (unsigned)pCorruptInfo->ui32ErrParentBlkAddress);
bldLogStr( 2, szBuf);
}
// Log the element offset, if known
- if (pCorruptInfo->uiErrElmOffset)
+ if (pCorruptInfo->ui32ErrElmOffset)
{
f_sprintf( szBuf, "Offset of Element within Block: %u",
- (unsigned)pCorruptInfo->uiErrElmOffset);
+ (unsigned)pCorruptInfo->ui32ErrElmOffset);
bldLogStr( 2, szBuf);
}
@@ -1053,9 +1053,9 @@ FSTATIC void bldLogCorruptError(
// Log the error message
- f_strcpy( szBuf, gv_pDbSystem->checkErrorToStr( pCorruptInfo->iErrCode));
+ f_strcpy( szBuf, gv_pDbSystem->checkErrorToStr( (FLMINT)pCorruptInfo->i32ErrCode));
f_sprintf( (&szBuf [f_strlen( szBuf)]), " (%d)",
- (int)pCorruptInfo->iErrCode);
+ (int)pCorruptInfo->i32ErrCode);
bldLogStr( 2, szBuf);
bldLogStr( 0, NULL);
}
@@ -1070,15 +1070,15 @@ RCODE F_LocalRebuildStatus::reportRebuild(
RCODE rc = NE_XFLM_OK;
// First update the display
- if( gv_iLastDoing != pRebuild->iDoingFlag)
+ if( gv_i32LastDoing != pRebuild->i32DoingFlag)
{
- gv_iLastDoing = pRebuild->iDoingFlag;
+ gv_i32LastDoing = pRebuild->i32DoingFlag;
- if( gv_iLastDoing == REBUILD_GET_BLK_SIZ)
+ if( gv_i32LastDoing == REBUILD_GET_BLK_SIZ)
{
bldOutValue( DOING_ROW, "Determining Block Size ");
}
- else if( gv_iLastDoing == REBUILD_RECOVER_DICT)
+ else if( gv_i32LastDoing == REBUILD_RECOVER_DICT)
{
bldOutValue( DOING_ROW, "Recovering Dictionaries ");
}
@@ -1088,7 +1088,7 @@ RCODE F_LocalRebuildStatus::reportRebuild(
}
}
- if( gv_iLastDoing != REBUILD_GET_BLK_SIZ)
+ if( gv_i32LastDoing != REBUILD_GET_BLK_SIZ)
{
if( gv_ui64TotalNodes != pRebuild->ui64TotNodes)
{
@@ -1096,7 +1096,7 @@ RCODE F_LocalRebuildStatus::reportRebuild(
bldOutNumValue( TOTAL_REC_ROW, gv_ui64TotalNodes);
}
- if( gv_iLastDoing == REBUILD_RECOVER_DICT)
+ if( gv_i32LastDoing == REBUILD_RECOVER_DICT)
{
if( gv_ui64DictNodesRecovered != pRebuild->ui64NodesRecov)
{
diff --git a/xflaim/util/view.cpp b/xflaim/util/view.cpp
index 70fee3d..31ce088 100644
--- a/xflaim/util/view.cpp
+++ b/xflaim/util/view.cpp
@@ -90,8 +90,8 @@ extern "C" int main(
gv_ViewFixOptions.ui32VersionNum = XFLM_CURRENT_VERSION_NUM;
gv_ViewFixOptions.ui32MinRflFileSize = XFLM_DEFAULT_MIN_RFL_FILE_SIZE;
gv_ViewFixOptions.ui32MaxRflFileSize = XFLM_DEFAULT_MAX_RFL_FILE_SIZE;
- gv_ViewFixOptions.i32KeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG;
- gv_ViewFixOptions.i32LogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG;
+ gv_ViewFixOptions.bKeepRflFiles = XFLM_DEFAULT_KEEP_RFL_FILES_FLAG;
+ gv_ViewFixOptions.bLogAbortedTransToRfl = XFLM_DEFAULT_LOG_ABORTED_TRANS_FLAG;
gv_ViewFixOptions.ui32DefaultLanguage = XFLM_DEFAULT_LANG;
// See if a file name was passed in
diff --git a/xflaim/util/view.h b/xflaim/util/view.h
index 1dc4dec..b724c1e 100644
--- a/xflaim/util/view.h
+++ b/xflaim/util/view.h
@@ -721,7 +721,7 @@ FLMBOOL ViewGetNum( // Source: viewedit.cpp
FLMUINT64 ui64MaxValue,
FLMBOOL * pbValEntered);
-FLMINT ViewEditNum( // Source: viewedit.cpp
+FLMBOOL ViewEditNum( // Source: viewedit.cpp
void * pvNum,
FLMBOOL bEnterHexFlag,
FLMUINT uiNumBytes,