From 76cb67c695cd2cd1e6f627a9fa4e0528f5e01f34 Mon Sep 17 00:00:00 2001 From: dsandersoremutah Date: Thu, 25 May 2006 21:22:30 +0000 Subject: [PATCH] Removed some unused parameters from the b-tree methods. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@466 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- xflaim/src/f_btree.cpp | 3 --- xflaim/src/f_btree.h | 3 --- xflaim/src/fbtrset.cpp | 8 +++----- xflaim/src/fdom.cpp | 18 +++++++++--------- xflaim/src/fqsort.cpp | 2 +- xflaim/src/fsrefupd.cpp | 4 +--- xflaim/src/rfl.cpp | 4 ++-- xflaim/util/fdomedt.cpp | 4 +--- 8 files changed, 17 insertions(+), 29 deletions(-) diff --git a/xflaim/src/f_btree.cpp b/xflaim/src/f_btree.cpp index 0ba4e24..974195a 100644 --- a/xflaim/src/f_btree.cpp +++ b/xflaim/src/f_btree.cpp @@ -666,7 +666,6 @@ Desc: Function to insert an entry into the Btree. ****************************************************************************/ RCODE F_Btree::btInsertEntry( const FLMBYTE * pucKey, - FLMUINT uiKeyBufSize, FLMUINT uiKeyLen, const FLMBYTE * pucData, FLMUINT uiDataLen, @@ -844,7 +843,6 @@ Desc: Function to remove an entry into the Btree. ****************************************************************************/ RCODE F_Btree::btRemoveEntry( const FLMBYTE * pucKey, - FLMUINT uiKeyBufSize, FLMUINT uiKeyLen) { RCODE rc = NE_XFLM_OK; @@ -897,7 +895,6 @@ Desc: Function to provide a streaming interface for replacing large ****************************************************************************/ RCODE F_Btree::btReplaceEntry( const FLMBYTE * pucKey, - FLMUINT uiKeyBufSize, FLMUINT uiKeyLen, const FLMBYTE * pucData, FLMUINT uiDataLen, diff --git a/xflaim/src/f_btree.h b/xflaim/src/f_btree.h index bc19386..afa2be5 100644 --- a/xflaim/src/f_btree.h +++ b/xflaim/src/f_btree.h @@ -290,12 +290,10 @@ public: RCODE btRemoveEntry( const FLMBYTE * pucKey, - FLMUINT uiKeyBufSize, FLMUINT uiKeyLen); RCODE btInsertEntry( const FLMBYTE * pucKey, - FLMUINT uiKeyBufSize, FLMUINT uiKeyLen, const FLMBYTE * pucData, FLMUINT uiDataLen, @@ -306,7 +304,6 @@ public: RCODE btReplaceEntry( const FLMBYTE * pucKey, - FLMUINT uiKeyBufSize, FLMUINT uiKeyLen, const FLMBYTE * pucData, FLMUINT uiDataLen, diff --git a/xflaim/src/fbtrset.cpp b/xflaim/src/fbtrset.cpp index 1271321..2c394a3 100644 --- a/xflaim/src/fbtrset.cpp +++ b/xflaim/src/fbtrset.cpp @@ -211,7 +211,7 @@ RCODE F_BtResultSet::addEntry( flmAssert( uiKeyLength <= XFLM_MAX_KEY_SIZE); - if( RC_BAD( rc = pBTree->btInsertEntry( pucKey, uiKeyLength, + if( RC_BAD( rc = pBTree->btInsertEntry( pucKey, uiKeyLength, pucEntry, uiEntryLength, TRUE, TRUE))) { if (rc == NE_XFLM_NOT_UNIQUE) @@ -255,7 +255,7 @@ RCODE F_BtResultSet::modifyEntry( flmAssert( uiKeyLength <= XFLM_MAX_KEY_SIZE); - if( RC_BAD( rc = pBTree->btReplaceEntry( pucKey, uiKeyLength, + if( RC_BAD( rc = pBTree->btReplaceEntry( pucKey, uiKeyLength, pucEntry, uiEntryLength, TRUE, TRUE))) { goto Exit; @@ -290,9 +290,7 @@ RCODE F_BtResultSet::deleteEntry( flmAssert( uiKeyLength <= XFLM_MAX_KEY_SIZE); - if (RC_BAD( rc = pBTree->btRemoveEntry( pucKey, - uiKeyLength, - uiKeyLength))) + if (RC_BAD( rc = pBTree->btRemoveEntry( pucKey, uiKeyLength))) { goto Exit; } diff --git a/xflaim/src/fdom.cpp b/xflaim/src/fdom.cpp index 5b01530..93be705 100644 --- a/xflaim/src/fdom.cpp +++ b/xflaim/src/fdom.cpp @@ -2429,7 +2429,7 @@ RCODE F_CachedNode::flushPendingInput( // b-tree. if( RC_BAD( rc = pDatabase->m_pPendingBTree->btInsertEntry( - ucKey, sizeof( ucKey), uiKeyLen, + ucKey, uiKeyLen, ucHeader, uiHeaderStorageSize + uiIVLen, TRUE, FALSE, &m_ui32BlkAddr, &m_uiOffsetIndex))) { @@ -2443,7 +2443,7 @@ RCODE F_CachedNode::flushPendingInput( else { if( RC_BAD( rc = pDatabase->m_pPendingBTree->btReplaceEntry( - ucKey, sizeof( ucKey), uiKeyLen, + ucKey, uiKeyLen, ucHeader, uiHeaderStorageSize + uiIVLen, TRUE, FALSE, TRUE, &m_ui32BlkAddr, &m_uiOffsetIndex))) { @@ -2495,7 +2495,7 @@ RCODE F_CachedNode::flushPendingInput( // insert method to stream its data into the b-tree if( RC_BAD( rc = pDatabase->m_pPendingBTree->btInsertEntry( - ucKey, sizeof( ucKey), uiKeyLen, + ucKey, uiKeyLen, pDatabase->m_pucUpdBuffer, uiOutputLength, FALSE, bLast, &m_ui32BlkAddr, &m_uiOffsetIndex))) @@ -2511,7 +2511,7 @@ RCODE F_CachedNode::flushPendingInput( else { if( RC_BAD( rc = pDatabase->m_pPendingBTree->btReplaceEntry( - ucKey, sizeof( ucKey), uiKeyLen, + ucKey, uiKeyLen, pDatabase->m_pucUpdBuffer, uiOutputLength, FALSE, bLast, TRUE, &m_ui32BlkAddr, &m_uiOffsetIndex))) @@ -3783,7 +3783,7 @@ RCODE F_DOMNode::setTextStreaming( uiOffsetIndex = getOffsetIndex(); if( RC_BAD( rc = pDatabase->m_pPendingBTree->btReplaceEntry( - ucKey, sizeof( ucKey), uiKeyLen, + ucKey, uiKeyLen, pDatabase->m_pucUpdBuffer, uiHeaderStorageSize + SEN_RESERVE_BYTES, TRUE, TRUE, FALSE, &ui32BlkAddr, &uiOffsetIndex))) { @@ -4491,7 +4491,7 @@ RCODE F_DOMNode::setBinaryStreaming( uiOffsetIndex = getOffsetIndex(); if( RC_BAD( rc = pDatabase->m_pPendingBTree->btReplaceEntry( - ucKey, sizeof( ucKey), uiKeyLen, + ucKey, uiKeyLen, pDatabase->m_pucUpdBuffer, uiHeaderStorageSize, TRUE, TRUE, FALSE, &ui32BlkAddr, &uiOffsetIndex))) { @@ -14363,7 +14363,7 @@ RCODE F_Db::flushNode( } if( RC_BAD( rc = pBTree->btInsertEntry( - ucKeyBuf, sizeof( ucKeyBuf), uiKeyLen, + ucKeyBuf, uiKeyLen, dynaBuf.getBufferPtr(), dynaBuf.getDataLength(), TRUE, TRUE, &ui32BlkAddr, &uiOffsetIndex))) { @@ -14380,7 +14380,7 @@ RCODE F_Db::flushNode( // Replace the node on disk. if( RC_BAD( rc = pBTree->btReplaceEntry( - ucKeyBuf, sizeof( ucKeyBuf), uiKeyLen, + ucKeyBuf, uiKeyLen, dynaBuf.getBufferPtr(), dynaBuf.getDataLength(), TRUE, TRUE, bTruncateOnReplace, &ui32BlkAddr, &uiOffsetIndex))) @@ -15344,7 +15344,7 @@ RCODE F_Db::purgeNode( bMustAbortOnError = TRUE; - if( RC_BAD( rc = pBTree->btRemoveEntry( ucKey, sizeof( ucKey), uiKeyLen))) + if( RC_BAD( rc = pBTree->btRemoveEntry( ucKey, uiKeyLen))) { if( rc != NE_XFLM_NOT_FOUND) { diff --git a/xflaim/src/fqsort.cpp b/xflaim/src/fqsort.cpp index 5481adf..7c52dd4 100644 --- a/xflaim/src/fqsort.cpp +++ b/xflaim/src/fqsort.cpp @@ -587,7 +587,7 @@ RCODE F_QueryResultSet::addEntry( m_pBTree->btResetBtree(); - if (RC_BAD( rc = m_pBTree->btInsertEntry( pucKey, uiKeyLen, uiKeyLen, NULL, + if (RC_BAD( rc = m_pBTree->btInsertEntry( pucKey, uiKeyLen, NULL, 0, TRUE, TRUE))) { goto Exit; diff --git a/xflaim/src/fsrefupd.cpp b/xflaim/src/fsrefupd.cpp index 4ff1968..6f9b376 100644 --- a/xflaim/src/fsrefupd.cpp +++ b/xflaim/src/fsrefupd.cpp @@ -64,7 +64,6 @@ RCODE F_Db::refUpdate( pbtree->btResetBtree(); if( RC_BAD( rc = pbtree->btInsertEntry( (FLMBYTE *)&pKrefEntry [1], pKrefEntry->ui16KeyLen, - pKrefEntry->ui16KeyLen, pKrefEntry->uiDataLen ? ((FLMBYTE *)(&pKrefEntry [1])) + 1 + pKrefEntry->ui16KeyLen : NULL, @@ -77,8 +76,7 @@ RCODE F_Db::refUpdate( { pbtree->btResetBtree(); if (RC_BAD( rc = pbtree->btRemoveEntry( - (FLMBYTE *)&pKrefEntry [1], pKrefEntry->ui16KeyLen, - pKrefEntry->ui16KeyLen))) + (FLMBYTE *)&pKrefEntry [1], pKrefEntry->ui16KeyLen))) { if (rc == NE_XFLM_NOT_FOUND) { diff --git a/xflaim/src/rfl.cpp b/xflaim/src/rfl.cpp index a601600..9d3e460 100644 --- a/xflaim/src/rfl.cpp +++ b/xflaim/src/rfl.cpp @@ -5385,7 +5385,7 @@ RCODE F_Rfl::recovEncryptedNodeUpdate( { if( bFirst && bUseDataOnlyBlocks) { - if( RC_BAD( rc = pBTree->btReplaceEntry( ucKey, sizeof( ucKey), + if( RC_BAD( rc = pBTree->btReplaceEntry( ucKey, uiKeyLen, pucDataPacketBody, uiDataPacketBodyLen, bFirst, FALSE))) { @@ -5398,7 +5398,7 @@ RCODE F_Rfl::recovEncryptedNodeUpdate( bLast = TRUE; } - if( RC_BAD( rc = pBTree->btReplaceEntry( ucKey, sizeof( ucKey), uiKeyLen, + if( RC_BAD( rc = pBTree->btReplaceEntry( ucKey, uiKeyLen, pucDataPacketBody, uiDataPacketBodyLen, bFirst, bLast))) { goto Exit; diff --git a/xflaim/util/fdomedt.cpp b/xflaim/util/fdomedt.cpp index 286dd29..67a4dff 100644 --- a/xflaim/util/fdomedt.cpp +++ b/xflaim/util/fdomedt.cpp @@ -13358,9 +13358,7 @@ RCODE F_DomEditor::viewOnlyDeleteIxKey( void ) // Delete the key. - if (RC_BAD( rc = pBtree->btRemoveEntry( pucKeyBuf, - XFLM_MAX_KEY_SIZE, - uiKeyLen))) + if (RC_BAD( rc = pBtree->btRemoveEntry( pucKeyBuf, uiKeyLen))) { goto Exit; }