From 99f01f6f0263f84eff47d3a66f2fce644c36e856 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Wed, 29 Mar 2006 23:43:45 +0000 Subject: [PATCH] Renamed MAX_KEY_SIZ to XFLM_MAX_KEY_SIZE and move the define into xflaim.h. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@226 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- xflaim/src/ddcreate.cpp | 2 +- xflaim/src/f_btree.cpp | 6 +-- xflaim/src/f_btree.h | 4 +- xflaim/src/fbtrset.cpp | 18 +++---- xflaim/src/fcollate.cpp | 4 +- xflaim/src/fcollate.h | 4 +- xflaim/src/flaimsys.h | 111 ++-------------------------------------- xflaim/src/flchkix.cpp | 6 +-- xflaim/src/flkeyret.cpp | 14 ++--- xflaim/src/flopen.cpp | 2 +- xflaim/src/flverify.cpp | 18 +++---- xflaim/src/fqsort.cpp | 16 +++--- xflaim/src/fscursor.cpp | 12 ++--- xflaim/src/fscursor.h | 2 +- xflaim/src/fstructs.h | 1 - xflaim/src/ftk.h | 103 ++++++++++++++++++++++++++++++++++++- xflaim/src/fvector.cpp | 2 +- xflaim/src/kybldkey.cpp | 34 ++++++------ xflaim/src/kybuild.cpp | 20 ++++---- xflaim/src/kycollat.cpp | 4 +- xflaim/src/kyeword.cpp | 2 +- xflaim/src/kyunlock.cpp | 2 +- 22 files changed, 191 insertions(+), 196 deletions(-) diff --git a/xflaim/src/ddcreate.cpp b/xflaim/src/ddcreate.cpp index 2c28df8..40f04d7 100644 --- a/xflaim/src/ddcreate.cpp +++ b/xflaim/src/ddcreate.cpp @@ -153,7 +153,7 @@ RCODE F_Db::dictReadDefs( LFILE * pLFile; IXD * pIxd; F_Btree * pbTree = NULL; - FLMBYTE ucKeyBuf [MAX_KEY_SIZ]; + FLMBYTE ucKeyBuf [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT uiFoundDictType; FLMUINT uiLowest; diff --git a/xflaim/src/f_btree.cpp b/xflaim/src/f_btree.cpp index ff2a239..7bb8010 100644 --- a/xflaim/src/f_btree.cpp +++ b/xflaim/src/f_btree.cpp @@ -2626,8 +2626,8 @@ RCODE F_Btree::createNewLevel( void) FLMUINT uiCounts = 0; FLMBYTE * pucEntry; FLMBYTE * pucNull = NULL; - FLMBYTE ucBuffer[ MAX_KEY_SIZ + BTE_NLC_KEY_START]; - FLMUINT uiMaxNLKey = MAX_KEY_SIZ + BTE_NLC_KEY_START; + FLMBYTE ucBuffer[ XFLM_MAX_KEY_SIZE + BTE_NLC_KEY_START]; + FLMUINT uiMaxNLKey = XFLM_MAX_KEY_SIZE + BTE_NLC_KEY_START; FLMUINT uiEntrySize; F_BTSK * pRootStack; FLMUINT uiFlags; @@ -4959,7 +4959,7 @@ RCODE F_Btree::findEntry( uiKeyLen = 0; } - if( uiKeyLen > MAX_KEY_SIZ) + if( uiKeyLen > XFLM_MAX_KEY_SIZE) { rc = RC_SET( NE_XFLM_BTREE_KEY_SIZE); goto Exit; diff --git a/xflaim/src/f_btree.h b/xflaim/src/f_btree.h index 9bc8434..a65dfd9 100644 --- a/xflaim/src/f_btree.h +++ b/xflaim/src/f_btree.h @@ -253,8 +253,8 @@ typedef struct FLMUINT uiChildBlkAddr; FLMUINT uiCounts; void * pPrev; - FLMBYTE pucParentKey[ MAX_KEY_SIZ]; - FLMBYTE pucNewKey[ MAX_KEY_SIZ]; + FLMBYTE pucParentKey[ XFLM_MAX_KEY_SIZE]; + FLMBYTE pucNewKey[ XFLM_MAX_KEY_SIZE]; } BTREE_REPLACE_STRUCT; class F_BtPool; diff --git a/xflaim/src/fbtrset.cpp b/xflaim/src/fbtrset.cpp index 6396dcc..8d98900 100644 --- a/xflaim/src/fbtrset.cpp +++ b/xflaim/src/fbtrset.cpp @@ -210,7 +210,7 @@ RCODE F_BtResultSet::addEntry( goto Exit; } - flmAssert( uiKeyLength <= MAX_KEY_SIZ); + flmAssert( uiKeyLength <= XFLM_MAX_KEY_SIZE); if( RC_BAD( rc = pBTree->btInsertEntry( pucKey, uiKeyLength, uiKeyLength, pucEntry, uiEntryLength, TRUE, TRUE))) @@ -254,7 +254,7 @@ RCODE F_BtResultSet::modifyEntry( goto Exit; } - flmAssert( uiKeyLength <= MAX_KEY_SIZ); + flmAssert( uiKeyLength <= XFLM_MAX_KEY_SIZE); if( RC_BAD( rc = pBTree->btReplaceEntry( pucKey, uiKeyLength, uiKeyLength, pucEntry, uiEntryLength, TRUE, TRUE))) @@ -289,7 +289,7 @@ RCODE F_BtResultSet::deleteEntry( goto Exit; } - flmAssert( uiKeyLength <= MAX_KEY_SIZ); + flmAssert( uiKeyLength <= XFLM_MAX_KEY_SIZE); if (RC_BAD( rc = pBTree->btRemoveEntry( pucKey, uiKeyLength, @@ -329,7 +329,7 @@ RCODE F_BtResultSet::findEntry( goto Exit; } - flmAssert( uiKeyBufLen <= MAX_KEY_SIZ); + flmAssert( uiKeyBufLen <= XFLM_MAX_KEY_SIZE); if( RC_BAD( rc = pBTree->btLocateEntry( pucKey, uiKeyBufLen, puiKeyLen, XFLM_EXACT, NULL, &uiLengthRV))) @@ -382,7 +382,7 @@ RCODE F_BtResultSet::getCurrent( goto Exit; } - flmAssert( uiKeyLength <= MAX_KEY_SIZ); + flmAssert( uiKeyLength <= XFLM_MAX_KEY_SIZE); if( RC_BAD( rc = pBTree->btGetEntry( pucKey, uiKeyLength, uiKeyLength, pucEntry, uiEntryLength, puiReturnLength))) @@ -426,7 +426,7 @@ RCODE F_BtResultSet::getNext( bFreeBTree = TRUE; } - flmAssert( uiKeyBufLen <= MAX_KEY_SIZ); + flmAssert( uiKeyBufLen <= XFLM_MAX_KEY_SIZE); if( RC_BAD( rc = pBTree->btNextEntry( pucKey, uiKeyBufLen, puiKeyLen, puiReturnLength))) @@ -479,7 +479,7 @@ RCODE F_BtResultSet::getPrev( bFreeBTree = TRUE; } - flmAssert( uiKeyBufLen <= MAX_KEY_SIZ); + flmAssert( uiKeyBufLen <= XFLM_MAX_KEY_SIZE); if( RC_BAD( rc = pBTree->btPrevEntry( pucKey, uiKeyBufLen, puiKeyLen, puiReturnLength))) @@ -532,7 +532,7 @@ RCODE F_BtResultSet::getFirst( bFreeBTree = TRUE; } - flmAssert( uiKeyBufLen <= MAX_KEY_SIZ); + flmAssert( uiKeyBufLen <= XFLM_MAX_KEY_SIZE); pBTree->btResetBtree(); @@ -587,7 +587,7 @@ RCODE F_BtResultSet::getLast( bFreeBTree = TRUE; } - flmAssert( uiKeyBufLen <= MAX_KEY_SIZ); + flmAssert( uiKeyBufLen <= XFLM_MAX_KEY_SIZE); if( RC_BAD( rc = pBTree->btLastEntry( pucKey, uiKeyBufLen, puiKeyLen, puiReturnLength))) diff --git a/xflaim/src/fcollate.cpp b/xflaim/src/fcollate.cpp index 39207c3..a1ad6fa 100644 --- a/xflaim/src/fcollate.cpp +++ b/xflaim/src/fcollate.cpp @@ -4319,13 +4319,13 @@ RCODE flmColText2StorageText( { // If it won't fit, allocate a new buffer - if( RC_BAD( rc = f_alloc( MAX_KEY_SIZ * 2, &pucWPPtr))) + if( RC_BAD( rc = f_alloc( XFLM_MAX_KEY_SIZE * 2, &pucWPPtr))) { goto Exit; } pucAllocatedWSPtr = pucWPPtr; - uiMaxWPBytes = uiWPStrLen = MAX_KEY_SIZ * 2; + uiMaxWPBytes = uiWPStrLen = XFLM_MAX_KEY_SIZE * 2; } else { diff --git a/xflaim/src/fcollate.h b/xflaim/src/fcollate.h index de316b1..8831190 100644 --- a/xflaim/src/fcollate.h +++ b/xflaim/src/fcollate.h @@ -154,8 +154,8 @@ // enough for the sset and JP characters - computed wrong. // This crashed the process that was building a key of sset characaters. -#define MAX_SUBCOL_BUF (500) // (((MAX_KEY_SIZ / 4) * 3 + fluff -#define MAX_CASE_BYTES (150) // ((MAX_KEY_SIZ -(MAX_KEY_SIZ / 8)) / 8) * 2 +#define MAX_SUBCOL_BUF (500) // (((XFLM_MAX_KEY_SIZE / 4) * 3 + fluff +#define MAX_CASE_BYTES (150) // ((XFLM_MAX_KEY_SIZE -(XFLM_MAX_KEY_SIZE / 8)) / 8) * 2 // Flags diff --git a/xflaim/src/flaimsys.h b/xflaim/src/flaimsys.h index 7e49008..83a5b71 100644 --- a/xflaim/src/flaimsys.h +++ b/xflaim/src/flaimsys.h @@ -27,119 +27,14 @@ #ifndef FLAIMSYS_H #define FLAIMSYS_H -#ifdef _WIN32 - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif - - #ifndef WIN32_EXTRA_LEAN - #define WIN32_EXTRA_LEAN - #endif - - // Enable critical section and spin count API to be visible in header - // file. - - #define _WIN32_WINNT 0x0403 - - #pragma pack( push, enter_windows, 8) - #include - #include - #include - #include - #include - #pragma pack( pop, enter_windows) - - // Conversion from XXX to YYY, possible loss of data - #pragma warning( disable : 4244) - - // Local variable XXX may be used without having been initialized - #pragma warning( disable : 4701) - - // Function XXX not inlined - #pragma warning( disable : 4710) - -#endif - // Public includes #include "xflaim.h" #ifdef HAVE_CONFIG_H -# include "../config.h" + #include "../config.h" #endif -#ifdef FLM_NLM - #if defined( FLM_WATCOM_NLM) - - #pragma warning 007 9 - - // Disable "Warning! W549: col(XX) 'sizeof' operand contains - // compiler generated information" - - #pragma warning 549 9 - - // Disable "Warning! W656: col(1) define this function inside its class - // definition (may improve code quality)" - - #pragma warning 656 9 - #endif -#endif - -/**************************************************************************** -Desc: Base class -****************************************************************************/ -class XF_Base -{ -public: - - XF_Base() - { - } - - virtual ~XF_Base() - { - } - - void * operator new( - FLMSIZET uiSize); - - void * operator new[]( - FLMSIZET uiSize); - -#ifdef FLM_DEBUG - void * operator new( - FLMSIZET uiSize, - const char * pszFile, - int iLine); -#endif - -#ifdef FLM_DEBUG - void * operator new[]( - FLMSIZET uiSize, - const char * pszFile, - int iLine); -#endif - - void operator delete( - void * ptr); - - void operator delete[]( - void * ptr); - -#if defined( FLM_DEBUG) && !defined( FLM_WATCOM_NLM) && !defined( FLM_SOLARIS) - void operator delete( - void * ptr, - const char * file, - int line); - - void operator delete[]( - void * ptr, - const char * file, - int line); -#endif - -}; - // Put all forward references here class F_Database; @@ -8004,9 +7899,9 @@ typedef struct Recov_Dict_Info typedef struct RSIxKeyTag { - FLMBYTE pucRSKeyBuf[ MAX_KEY_SIZ]; + FLMBYTE pucRSKeyBuf[ XFLM_MAX_KEY_SIZE]; FLMUINT uiRSKeyLen; - FLMBYTE pucRSDataBuf[ MAX_KEY_SIZ]; + FLMBYTE pucRSDataBuf[ XFLM_MAX_KEY_SIZE]; FLMUINT uiRSDataLen; } RS_IX_KEY; diff --git a/xflaim/src/flchkix.cpp b/xflaim/src/flchkix.cpp index 917862f..f240eb3 100644 --- a/xflaim/src/flchkix.cpp +++ b/xflaim/src/flchkix.cpp @@ -80,10 +80,10 @@ RCODE F_DbCheck::chkGetNextRSKey( void) if (RC_BAD( rc = m_pIxRSet->getFirst( m_pDb, m_pIxd, NULL, pCurrRSKey->pucRSKeyBuf, - MAX_KEY_SIZ, + XFLM_MAX_KEY_SIZE, &pCurrRSKey->uiRSKeyLen, pCurrRSKey->pucRSDataBuf, - MAX_KEY_SIZ, + XFLM_MAX_KEY_SIZE, &pCurrRSKey->uiRSDataLen))) { goto Exit; @@ -730,7 +730,7 @@ RCODE F_DbCheck::addDelKeyRef( FLMBOOL bDelete) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKeyBuf[ sizeof( KREF_ENTRY) + MAX_KEY_SIZ]; + FLMBYTE ucKeyBuf[ sizeof( KREF_ENTRY) + XFLM_MAX_KEY_SIZE]; KREF_ENTRY * pKrefEntry = (KREF_ENTRY *)(&ucKeyBuf[ 0]); FLMBOOL bStartedUpdate = FALSE; FLMBOOL bKeyInDoc; diff --git a/xflaim/src/flkeyret.cpp b/xflaim/src/flkeyret.cpp index 7791a46..d450df8 100644 --- a/xflaim/src/flkeyret.cpp +++ b/xflaim/src/flkeyret.cpp @@ -91,14 +91,14 @@ RCODE F_Db::keyRetrieve( if (pSearchKey) { - if (RC_BAD( rc = m_TempPool.poolAlloc( MAX_KEY_SIZ, + if (RC_BAD( rc = m_TempPool.poolAlloc( XFLM_MAX_KEY_SIZE, (void **)&pucSearchKey))) { goto Exit; } } - if (RC_BAD( rc = m_TempPool.poolAlloc( MAX_KEY_SIZ, (void **)&pucFoundKey))) + if (RC_BAD( rc = m_TempPool.poolAlloc( XFLM_MAX_KEY_SIZE, (void **)&pucFoundKey))) { goto Exit; } @@ -162,7 +162,7 @@ RCODE F_Db::keyRetrieve( } if (RC_BAD( rc = pSearchKey->outputKey( pIxd, uiIdMatchFlags, - pucSearchKey, MAX_KEY_SIZ, &uiSearchKeyLen, SEARCH_KEY_FLAG))) + pucSearchKey, XFLM_MAX_KEY_SIZE, &uiSearchKeyLen, SEARCH_KEY_FLAG))) { goto Exit; } @@ -225,7 +225,7 @@ RCODE F_Db::keyRetrieve( uiFoundKeyLen = uiSearchKeyLen; if( RC_BAD( rc = pbtree->btLocateEntry( - pucFoundKey, MAX_KEY_SIZ, &uiFoundKeyLen, uiFlags, NULL, + pucFoundKey, XFLM_MAX_KEY_SIZE, &uiFoundKeyLen, uiFlags, NULL, &uiDataLen))) { if (rc == NE_XFLM_EOF_HIT && uiOriginalFlags & XFLM_EXACT) @@ -280,9 +280,9 @@ RCODE F_Db::keyRetrieve( // reuse it since we are not going to do anything with // it after this. Otherwise, allocate a new buffer. - if (uiDataLen <= MAX_KEY_SIZ && pucSearchKey) + if (uiDataLen <= XFLM_MAX_KEY_SIZE && pucSearchKey) { - uiDataBufSize = MAX_KEY_SIZ; + uiDataBufSize = XFLM_MAX_KEY_SIZE; pucData = pucSearchKey; } else @@ -298,7 +298,7 @@ RCODE F_Db::keyRetrieve( // Retrieve the data if (RC_BAD( rc = pbtree->btGetEntry( - pucFoundKey, MAX_KEY_SIZ, uiFoundKeyLen, + pucFoundKey, XFLM_MAX_KEY_SIZE, uiFoundKeyLen, pucData, uiDataBufSize, &uiDataLen))) { goto Exit; diff --git a/xflaim/src/flopen.cpp b/xflaim/src/flopen.cpp index f472cf0..c72ce45 100644 --- a/xflaim/src/flopen.cpp +++ b/xflaim/src/flopen.cpp @@ -130,7 +130,7 @@ F_Db::F_Db( m_pKrefReset = NULL; m_tmpKrefPool.poolInit( 8192); - m_TempPool.poolInit( MAX_KEY_SIZ * 4); + m_TempPool.poolInit( XFLM_MAX_KEY_SIZE * 4); } /*************************************************************************** diff --git a/xflaim/src/flverify.cpp b/xflaim/src/flverify.cpp index bac60e5..ed6171c 100644 --- a/xflaim/src/flverify.cpp +++ b/xflaim/src/flverify.cpp @@ -375,7 +375,7 @@ RCODE flmVerifyElement( // Verify the key length is not too big - if( pStateInfo->uiElmKeyLen > MAX_KEY_SIZ) + if( pStateInfo->uiElmKeyLen > XFLM_MAX_KEY_SIZE) { *piErrCode = FLM_BAD_ELM_KEY_SIZE; goto Exit; @@ -1316,7 +1316,7 @@ RCODE F_DbCheck::verifyBTrees( if (uiKeysAllocated < pLogicalFile->uiNumLevels) { - if (RC_BAD( rc = f_realloc( pLogicalFile->uiNumLevels * MAX_KEY_SIZ, + if (RC_BAD( rc = f_realloc( pLogicalFile->uiNumLevels * XFLM_MAX_KEY_SIZE, &pucKeyBuffer))) { goto Exit; @@ -1407,7 +1407,7 @@ RCODE F_DbCheck::verifyBTrees( pLogicalFile, uiCurrLevel, uiExpectedBlkType, - &pucKeyBuffer [uiCurrLevel * MAX_KEY_SIZ]); + &pucKeyBuffer [uiCurrLevel * XFLM_MAX_KEY_SIZE]); State[ uiCurrLevel].pCollection = m_pCollection; State[ uiCurrLevel].uiRootLevel = pLogicalFile->uiNumLevels - 1; @@ -1650,7 +1650,7 @@ Reset: pLogicalFile, uiCurrLevel, uiExpectedBlkType, - &pucKeyBuffer [uiCurrLevel * MAX_KEY_SIZ]); + &pucKeyBuffer [uiCurrLevel * XFLM_MAX_KEY_SIZE]); State[ uiCurrLevel].pCollection = m_pCollection; State[ uiCurrLevel].uiRootLevel = pLogicalFile->uiNumLevels - 1; @@ -2263,8 +2263,8 @@ RCODE F_DbCheck::verifyNodePointers( F_BtResultSet * pResult = pStateInfo->pNodeRS; FLMUINT uiRSEntrySize = sizeof( NODE_RS_ENTRY); FLMBOOL bFirst = TRUE; - FLMBYTE pucKey[ MAX_KEY_SIZ]; - FLMUINT uiKeyLength = MAX_KEY_SIZ; + FLMBYTE pucKey[ XFLM_MAX_KEY_SIZE]; + FLMUINT uiKeyLength = XFLM_MAX_KEY_SIZE; F_Btree * pBTree = NULL; FLMINT iErrCode = 0; @@ -2294,7 +2294,7 @@ RCODE F_DbCheck::verifyNodePointers( if (RC_BAD( rc = pResult->getFirst( NULL, NULL, pBTree, pucKey, - MAX_KEY_SIZ, + XFLM_MAX_KEY_SIZE, &uiKeyLength, (FLMBYTE *)pRSEntry, sizeof( NODE_RS_ENTRY), @@ -2313,7 +2313,7 @@ RCODE F_DbCheck::verifyNodePointers( { if (RC_BAD( rc = pResult->getNext( NULL, NULL, pBTree, pucKey, - MAX_KEY_SIZ, + XFLM_MAX_KEY_SIZE, &uiKeyLength, (FLMBYTE *)pRSEntry, sizeof( NODE_RS_ENTRY), @@ -4875,7 +4875,7 @@ RCODE F_KeyCollector::addKey( FLMBYTE * pucData = pucKey + pKref->ui16KeyLen; FLMUINT uiDataLen; - flmAssert( pKref->ui16KeyLen <= MAX_KEY_SIZ); + flmAssert( pKref->ui16KeyLen <= XFLM_MAX_KEY_SIZE); // Can't store an entry with zero length data. diff --git a/xflaim/src/fqsort.cpp b/xflaim/src/fqsort.cpp index 49e2e2c..7ff7940 100644 --- a/xflaim/src/fqsort.cpp +++ b/xflaim/src/fqsort.cpp @@ -853,7 +853,7 @@ RCODE F_QueryResultSet::positionToEntry( FLMBOOL bLockMutex) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucSearchKey [MAX_KEY_SIZ]; + FLMBYTE ucSearchKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiSearchKeyLen = 0; FLMUINT uiOriginalFlags; FLMUINT uiIdMatchFlags = uiFlags & (XFLM_MATCH_IDS | XFLM_MATCH_DOC_ID); @@ -1672,7 +1672,7 @@ RCODE F_Query::getFirstFromResultSet( FLMUINT uiTimeLimit) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT64 ui64DocId; FLMUINT uiNumToWaitFor = 1; @@ -1790,7 +1790,7 @@ RCODE F_Query::getLastFromResultSet( FLMUINT uiTimeLimit) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT64 ui64DocId; FLMUINT uiStartTimeTU = 0; @@ -1890,7 +1890,7 @@ RCODE F_Query::getNextFromResultSet( FLMUINT * puiNumSkipped) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT64 ui64DocId; FLMUINT uiStartTimeTU = 0; @@ -2031,7 +2031,7 @@ RCODE F_Query::getPrevFromResultSet( FLMUINT * puiNumSkipped) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT64 ui64DocId; FLMUINT uiStartTimeTU = 0; @@ -2181,7 +2181,7 @@ RCODE F_Query::getCurrentFromResultSet( IF_DOMNode ** ppNode) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT64 ui64DocId; @@ -2264,7 +2264,7 @@ RCODE XFLMAPI F_Query::positionTo( ) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT64 ui64DocId; FLMUINT uiStartTimeTU = 0; @@ -2429,7 +2429,7 @@ RCODE XFLMAPI F_Query::positionTo( ) { RCODE rc = NE_XFLM_OK; - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; FLMUINT64 ui64DocId; FLMUINT uiStartTimeTU = 0; diff --git a/xflaim/src/fscursor.cpp b/xflaim/src/fscursor.cpp index 73cf268..c9c742c 100644 --- a/xflaim/src/fscursor.cpp +++ b/xflaim/src/fscursor.cpp @@ -516,7 +516,7 @@ RCODE FSIndexCursor::getKeyData( // Retrieve the data if (RC_BAD( rc = pBTree->btGetEntry( - m_curKey.ucKey, MAX_KEY_SIZ, m_curKey.uiKeyLen, + m_curKey.ucKey, XFLM_MAX_KEY_SIZE, m_curKey.uiKeyLen, m_pucCurKeyDataBuf, m_uiCurKeyDataBufSize, &m_uiCurKeyDataLen))) { @@ -573,7 +573,7 @@ RCODE FSIndexCursor::setKeyPosition( m_ixCompare.setSearchKey( pExtSrchKey); m_ixCompare.setCompareDocId( pExtSrchKey ? FALSE : TRUE); m_ixCompare.setCompareNodeIds( pExtSrchKey ? FALSE : TRUE); - if (RC_BAD( rc = pBTree->btLocateEntry( pFoundKey->ucKey, MAX_KEY_SIZ, + if (RC_BAD( rc = pBTree->btLocateEntry( pFoundKey->ucKey, XFLM_MAX_KEY_SIZE, &pFoundKey->uiKeyLen, (bGoingForward && bExcludeKey) ? XFLM_EXCL @@ -603,7 +603,7 @@ RCODE FSIndexCursor::setKeyPosition( // Position to last key in tree. - if (RC_BAD( rc = pBTree->btLastEntry( pFoundKey->ucKey, MAX_KEY_SIZ, + if (RC_BAD( rc = pBTree->btLastEntry( pFoundKey->ucKey, XFLM_MAX_KEY_SIZE, &pFoundKey->uiKeyLen, &uiDataLen, NULL, NULL))) { @@ -636,7 +636,7 @@ RCODE FSIndexCursor::setKeyPosition( // Position to the previous key. - if (RC_BAD( rc = pBTree->btPrevEntry( pFoundKey->ucKey, MAX_KEY_SIZ, + if (RC_BAD( rc = pBTree->btPrevEntry( pFoundKey->ucKey, XFLM_MAX_KEY_SIZE, &pFoundKey->uiKeyLen, &uiDataLen, NULL, NULL))) { @@ -981,7 +981,7 @@ RCODE FSIndexCursor::nextKey( // Get the next key, if any - if (RC_BAD( rc = m_pbTree->btNextEntry( m_curKey.ucKey, MAX_KEY_SIZ, + if (RC_BAD( rc = m_pbTree->btNextEntry( m_curKey.ucKey, XFLM_MAX_KEY_SIZE, &m_curKey.uiKeyLen, &uiDataLen, NULL, NULL))) { if (rc == NE_XFLM_EOF_HIT) @@ -1219,7 +1219,7 @@ RCODE FSIndexCursor::prevKey( // Get the previous key, if any - if (RC_BAD( rc = m_pbTree->btPrevEntry( m_curKey.ucKey, MAX_KEY_SIZ, + if (RC_BAD( rc = m_pbTree->btPrevEntry( m_curKey.ucKey, XFLM_MAX_KEY_SIZE, &m_curKey.uiKeyLen, &uiDataLen, NULL, NULL))) { if (rc == NE_XFLM_BOF_HIT) diff --git a/xflaim/src/fscursor.h b/xflaim/src/fscursor.h index 69d1a46..6b304ea 100644 --- a/xflaim/src/fscursor.h +++ b/xflaim/src/fscursor.h @@ -30,7 +30,7 @@ typedef struct KeyPosition { - FLMBYTE ucKey [MAX_KEY_SIZ]; + FLMBYTE ucKey [XFLM_MAX_KEY_SIZE]; FLMUINT uiKeyLen; } KEYPOS; diff --git a/xflaim/src/fstructs.h b/xflaim/src/fstructs.h index c6ae058..afe6be7 100644 --- a/xflaim/src/fstructs.h +++ b/xflaim/src/fstructs.h @@ -661,7 +661,6 @@ typedef struct FNotify // Maximum length of a key. -#define MAX_KEY_SIZ 1024 #define MAX_ID_SIZE 256 // Cannot be more than 256 because // we can only use one byte to // represent the total ID size. diff --git a/xflaim/src/ftk.h b/xflaim/src/ftk.h index 8a4c6c7..a470b28 100644 --- a/xflaim/src/ftk.h +++ b/xflaim/src/ftk.h @@ -27,13 +27,29 @@ #ifndef FTK_H #define FTK_H - class F_DOMNode; + #ifndef FLM_PLATFORM_CONFIGURED + #error Platform not configured + #endif /**************************************************************************** Desc: NLM ****************************************************************************/ #if defined( FLM_NLM) + #if defined( FLM_WATCOM_NLM) + #pragma warning 007 9 + + // Disable "Warning! W549: col(XX) 'sizeof' operand contains + // compiler generated information" + + #pragma warning 549 9 + + // Disable "Warning! W656: col(1) define this function inside its class + // definition (may improve code quality)" + + #pragma warning 656 9 + #endif + #include #include #include @@ -146,6 +162,36 @@ ****************************************************************************/ #if defined( FLM_WIN) + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + + #ifndef WIN32_EXTRA_LEAN + #define WIN32_EXTRA_LEAN + #endif + + // Enable critical section and spin count API to be visible in header + // file. + + #define _WIN32_WINNT 0x0403 + + #pragma pack( push, enter_windows, 8) + #include + #include + #include + #include + #include + #pragma pack( pop, enter_windows) + + // Conversion from XXX to YYY, possible loss of data + #pragma warning( disable : 4244) + + // Local variable XXX may be used without having been initialized + #pragma warning( disable : 4701) + + // Function XXX not inlined + #pragma warning( disable : 4710) + #define FSTATIC static #define ENDLINE ENDLINE_CRLF @@ -407,6 +453,61 @@ FLMUINT32 m_ui32RefCnt; }; + /**************************************************************************** + Desc: Base class + ****************************************************************************/ + class XF_Base + { + public: + + XF_Base() + { + } + + virtual ~XF_Base() + { + } + + void * operator new( + FLMSIZET uiSize); + + void * operator new[]( + FLMSIZET uiSize); + + #ifdef FLM_DEBUG + void * operator new( + FLMSIZET uiSize, + const char * pszFile, + int iLine); + #endif + + #ifdef FLM_DEBUG + void * operator new[]( + FLMSIZET uiSize, + const char * pszFile, + int iLine); + #endif + + void operator delete( + void * ptr); + + void operator delete[]( + void * ptr); + + #if defined( FLM_DEBUG) && !defined( FLM_WATCOM_NLM) && !defined( FLM_SOLARIS) + void operator delete( + void * ptr, + const char * file, + int line); + + void operator delete[]( + void * ptr, + const char * file, + int line); + #endif + + }; + /**************************************************************************** Desc: This class is used to do pool memory allocations. ****************************************************************************/ diff --git a/xflaim/src/fvector.cpp b/xflaim/src/fvector.cpp index a0a0451..fa5dc37 100644 --- a/xflaim/src/fvector.cpp +++ b/xflaim/src/fvector.cpp @@ -1166,7 +1166,7 @@ RCODE F_DataVector::inputKey( { RCODE rc = NE_XFLM_OK; const FLMBYTE * pucKeyEnd = pucKey + uiKeyLen; - FLMBYTE ucDataBuf [MAX_KEY_SIZ]; + FLMBYTE ucDataBuf [XFLM_MAX_KEY_SIZE]; FLMUINT uiDataLen; ICD * pIcd; FLMUINT uiLanguage = pIxd->uiLanguage; diff --git a/xflaim/src/kybldkey.cpp b/xflaim/src/kybldkey.cpp index 119ce8b..d0917ca 100644 --- a/xflaim/src/kybldkey.cpp +++ b/xflaim/src/kybldkey.cpp @@ -265,7 +265,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - uiFromKeyLen = MAX_KEY_SIZ - 2; + uiFromKeyLen = XFLM_MAX_KEY_SIZE - 2; bDataTruncated = FALSE; // Pass 0 for compare rules because it is non-text @@ -627,7 +627,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - uiFromKeyLen = MAX_KEY_SIZ - 2; + uiFromKeyLen = XFLM_MAX_KEY_SIZE - 2; bDataTruncated = FALSE; // Pass 0 for compare rules on non-text component. @@ -709,7 +709,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( { goto Exit; } - uiUntilKeyLen = MAX_KEY_SIZ - 2; + uiUntilKeyLen = XFLM_MAX_KEY_SIZE - 2; bDataTruncated = FALSE; // Pass 0 for compare rule because it is a non-text piece. @@ -748,15 +748,15 @@ FSTATIC RCODE flmAddNonTextKeyPiece( UW2FBA( (FLMUINT16)(uiFromKeyLen | uiFromFlags), pucFromKeyLenPos); UW2FBA( (FLMUINT16)(uiUntilKeyLen | uiUntilFlags), pucUntilKeyLenPos); - if (!(uiFromFlags & EXCLUSIVE_GT_FLAG) && uiFromKeyLen < MAX_KEY_SIZ - 2) + if (!(uiFromFlags & EXCLUSIVE_GT_FLAG) && uiFromKeyLen < XFLM_MAX_KEY_SIZE - 2) { uiFromKeyLen += kyAddInclComponent( pIcd, &pucFromKey [uiFromKeyLen], - TRUE, MAX_KEY_SIZ - 2 - uiFromKeyLen); + TRUE, XFLM_MAX_KEY_SIZE - 2 - uiFromKeyLen); } - if (!(uiUntilFlags & EXCLUSIVE_LT_FLAG) && uiUntilKeyLen < MAX_KEY_SIZ - 2) + if (!(uiUntilFlags & EXCLUSIVE_LT_FLAG) && uiUntilKeyLen < XFLM_MAX_KEY_SIZE - 2) { uiUntilKeyLen += kyAddInclComponent( pIcd, &pucUntilKey [uiUntilKeyLen], - FALSE, MAX_KEY_SIZ - 2 - uiUntilKeyLen); + FALSE, XFLM_MAX_KEY_SIZE - 2 - uiUntilKeyLen); } // Set the FROM and UNTIL key length return values. @@ -1583,7 +1583,7 @@ FSTATIC RCODE flmAddTextKeyPiece( // Add ICD_ESC_CHAR to the icd flags because // the search string must have BACKSLASHES and '*' escaped. - uiFromKeyLen = MAX_KEY_SIZ - 2; + uiFromKeyLen = XFLM_MAX_KEY_SIZE - 2; bDataTruncated = FALSE; if (RC_BAD( rc = KYCollateValue( pucFromKey, &uiFromKeyLen, &bufferIStream, XFLM_TEXT_TYPE, @@ -1688,8 +1688,8 @@ FSTATIC RCODE flmAddTextKeyPiece( // Fill the rest of the until key with high values. f_memset( &pucUntilKey[ uiCollationLen], 0xFF, - MAX_KEY_SIZ - uiCollationLen - 2); - uiUntilKeyLen = MAX_KEY_SIZ - 2; + XFLM_MAX_KEY_SIZE - uiCollationLen - 2); + uiUntilKeyLen = XFLM_MAX_KEY_SIZE - 2; } else { @@ -1716,8 +1716,8 @@ FSTATIC RCODE flmAddTextKeyPiece( // Fill rest of from key with high values after collation values. f_memset( &pucFromKey[ uiCollationLen], 0xFF, - MAX_KEY_SIZ - uiCollationLen - 2); - uiFromKeyLen = MAX_KEY_SIZ - 2; + XFLM_MAX_KEY_SIZE - uiCollationLen - 2); + uiFromKeyLen = XFLM_MAX_KEY_SIZE - 2; } } else @@ -1814,7 +1814,7 @@ FSTATIC RCODE flmAddTextKeyPiece( // Add ICD_ESC_CHAR to the icd flags because // the search string must have BACKSLASHES and '*' escaped. - uiUntilKeyLen = MAX_KEY_SIZ - 2; + uiUntilKeyLen = XFLM_MAX_KEY_SIZE - 2; bDataTruncated = FALSE; if (RC_BAD( rc = KYCollateValue( pucUntilKey, &uiUntilKeyLen, &bufferIStream, XFLM_TEXT_TYPE, @@ -1864,15 +1864,15 @@ FSTATIC RCODE flmAddTextKeyPiece( UW2FBA( (FLMUINT16)(uiFromKeyLen | uiFromFlags), pucFromKeyLenPos); UW2FBA( (FLMUINT16)(uiUntilKeyLen | uiUntilFlags), pucUntilKeyLenPos); - if (!(uiFromFlags & EXCLUSIVE_GT_FLAG) && uiFromKeyLen < MAX_KEY_SIZ - 2) + if (!(uiFromFlags & EXCLUSIVE_GT_FLAG) && uiFromKeyLen < XFLM_MAX_KEY_SIZE - 2) { uiFromKeyLen += kyAddInclComponent( pIcd, &pucFromKey [uiFromKeyLen], - TRUE, MAX_KEY_SIZ - 2 - uiFromKeyLen); + TRUE, XFLM_MAX_KEY_SIZE - 2 - uiFromKeyLen); } - if (!(uiUntilFlags & EXCLUSIVE_LT_FLAG) && uiUntilKeyLen < MAX_KEY_SIZ - 2) + if (!(uiUntilFlags & EXCLUSIVE_LT_FLAG) && uiUntilKeyLen < XFLM_MAX_KEY_SIZE - 2) { uiUntilKeyLen += kyAddInclComponent( pIcd, &pucUntilKey [uiUntilKeyLen], - FALSE, MAX_KEY_SIZ - 2 - uiUntilKeyLen); + FALSE, XFLM_MAX_KEY_SIZE - 2 - uiUntilKeyLen); } // Set the FROM and UNTIL key lengths diff --git a/xflaim/src/kybuild.cpp b/xflaim/src/kybuild.cpp index 2433548..082d964 100644 --- a/xflaim/src/kybuild.cpp +++ b/xflaim/src/kybuild.cpp @@ -847,7 +847,7 @@ RCODE F_Db::buildData( m_keyGenInfo.pIxd, m_keyGenInfo.pCdlTbl, &m_keyGenInfo.pucKeyBuf [uiKeyLen], - MAX_KEY_SIZ - uiKeyLen, &uiIDLen))) + XFLM_MAX_KEY_SIZE - uiKeyLen, &uiIDLen))) { goto Exit; } @@ -973,7 +973,7 @@ RCODE F_Db::buildContext( m_keyGenInfo.pIxd, m_keyGenInfo.pCdlTbl, &m_keyGenInfo.pucKeyBuf [uiKeyLen], - MAX_KEY_SIZ - uiKeyLen, &uiIDLen))) + XFLM_MAX_KEY_SIZE - uiKeyLen, &uiIDLen))) { goto Exit; } @@ -1070,7 +1070,7 @@ RCODE F_Db::finishKeyComponent( m_keyGenInfo.pIxd, m_keyGenInfo.pCdlTbl, &m_keyGenInfo.pucKeyBuf [uiKeyLen], - MAX_KEY_SIZ - uiKeyLen, + XFLM_MAX_KEY_SIZE - uiKeyLen, &uiIDLen))) { goto Exit; @@ -1181,7 +1181,7 @@ No_Strings: if (bWholeString) { - uiElmLen = MAX_KEY_SIZ - uiKeyLen; + uiElmLen = XFLM_MAX_KEY_SIZE - uiKeyLen; if( RC_BAD( rc = KYCollateValue( &m_keyGenInfo.pucKeyBuf [uiKeyLen], &uiElmLen, pIStream, XFLM_TEXT_TYPE, @@ -1199,7 +1199,7 @@ No_Strings: if (*ppucTmpBuf == NULL) { *ppvMark = m_TempPool.poolMark(); - *puiTmpBufSize = (FLMUINT)MAX_KEY_SIZ + 8; + *puiTmpBufSize = (FLMUINT)XFLM_MAX_KEY_SIZE + 8; if (RC_BAD( rc = m_TempPool.poolAlloc( *puiTmpBufSize, (void **)ppucTmpBuf))) { @@ -1231,7 +1231,7 @@ No_Strings: // Pass 0 for compare rules because KYEachWordParse will already // have taken care of them - except for XFLM_COMP_CASE_INSENSITIVE. - uiElmLen = MAX_KEY_SIZ - uiKeyLen; + uiElmLen = XFLM_MAX_KEY_SIZE - uiKeyLen; rc = KYCollateValue( &m_keyGenInfo.pucKeyBuf [uiKeyLen], &uiElmLen, &bufferStream, XFLM_TEXT_TYPE, @@ -1283,7 +1283,7 @@ No_Strings: // Pass 0 for compare rules - only applies to strings. - uiElmLen = MAX_KEY_SIZ - uiKeyLen; + uiElmLen = XFLM_MAX_KEY_SIZE - uiKeyLen; rc = KYCollateValue( &m_keyGenInfo.pucKeyBuf [uiKeyLen], &uiElmLen, &bufferStream, XFLM_NUMBER_TYPE, @@ -1307,7 +1307,7 @@ No_Strings: if (*ppucTmpBuf == NULL) { *ppvMark = m_TempPool.poolMark(); - *puiTmpBufSize = (FLMUINT)MAX_KEY_SIZ + 8; + *puiTmpBufSize = (FLMUINT)XFLM_MAX_KEY_SIZE + 8; if (RC_BAD( rc = m_TempPool.poolAlloc( *puiTmpBufSize, (void **)ppucTmpBuf))) { @@ -1344,7 +1344,7 @@ No_Strings: // Pass 0 for compare rules, because KYSubstringParse has already // taken care of them, except for XFLM_COMP_CASE_INSENSITIVE - uiElmLen = MAX_KEY_SIZ - uiKeyLen; + uiElmLen = XFLM_MAX_KEY_SIZE - uiKeyLen; rc = KYCollateValue( &m_keyGenInfo.pucKeyBuf [uiKeyLen], &uiElmLen, &bufferStream, XFLM_TEXT_TYPE, @@ -1491,7 +1491,7 @@ No_Data: // Compute number of bytes left - uiElmLen = MAX_KEY_SIZ - uiKeyLen; + uiElmLen = XFLM_MAX_KEY_SIZE - uiKeyLen; bDataTruncated = FALSE; // Pass zero for compare rules - these are not strings. diff --git a/xflaim/src/kycollat.cpp b/xflaim/src/kycollat.cpp index 96afd6c..27b2d19 100644 --- a/xflaim/src/kycollat.cpp +++ b/xflaim/src/kycollat.cpp @@ -343,8 +343,8 @@ Exit: /**************************************************************************** Desc: Format text removing leading and trailing spaces. Treat underscores as spaces. As options, remove all spaces and dashes. -Ret: NE_XFLM_OK always. WIll truncate so text will fill MAX_KEY_SIZ. - Allocate 8 more than MAX_KEY_SIZ for psDestBuf. +Ret: NE_XFLM_OK always. WIll truncate so text will fill XFLM_MAX_KEY_SIZE. + Allocate 8 more than XFLM_MAX_KEY_SIZE for psDestBuf. Visit: Pass in uiLimit and pass back a truncated flag when the string is truncated. This was not done because we will have to get the exact truncated count that is done in f_tocoll.cpp diff --git a/xflaim/src/kyeword.cpp b/xflaim/src/kyeword.cpp index 615deb8..009f60f 100644 --- a/xflaim/src/kyeword.cpp +++ b/xflaim/src/kyeword.cpp @@ -288,7 +288,7 @@ RCODE KYEachWordParse( IF_PosIStream * pIStream, FLMUINT * puiCompareRules, FLMUINT uiLimit, // [in] Max characters - FLMBYTE * pucWordBuf, // [out] Buffer of at least MAX_KEY_SIZ + FLMBYTE * pucWordBuf, // [out] Buffer of at least XFLM_MAX_KEY_SIZE FLMUINT * puiWordLen) { RCODE rc = NE_XFLM_OK; diff --git a/xflaim/src/kyunlock.cpp b/xflaim/src/kyunlock.cpp index ca9bbec..3d4ae16 100644 --- a/xflaim/src/kyunlock.cpp +++ b/xflaim/src/kyunlock.cpp @@ -83,7 +83,7 @@ RCODE F_Db::krefCntrlCheck( void) if( !m_pucKrefKeyBuf) { - if (RC_BAD( rc = f_alloc( MAX_KEY_SIZ, &m_pucKrefKeyBuf))) + if (RC_BAD( rc = f_alloc( XFLM_MAX_KEY_SIZE, &m_pucKrefKeyBuf))) { goto Exit; }