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

Renamed big-endian byte-swap macros to make their purpose clear.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@207 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-03-23 22:39:50 +00:00
parent a72914ec65
commit 436f3115aa
24 changed files with 1830 additions and 1819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
flaim/src/fssearch.cpp
View File

@@ -101,7 +101,8 @@ RCODE FSBtSearch(
else
{
rc = FSBtScanNonLeafData( pStack, keyLen == 1
? (FLMUINT) *key : (FLMUINT) byteToLong( key));
? *key
: flmBigEndianToUINT32( key));
}
if( RC_BAD( rc))
{
@@ -158,7 +159,7 @@ RCODE FSBtSearchEnd(
goto Exit;
}
longToByte( uiDrn, key);
flmUINT32ToBigEndian( uiDrn, key);
for(;;)
{
pStack->uiFlags = FULL_STACK;
@@ -525,7 +526,7 @@ RCODE FSBtScanNonLeafData(
{
uiMid = (uiLow + uiHigh) >> 1; // (uiLow + uiHigh) / 2
uiCurDrn = byteToLong( &pBlk[ BH_OVHD + (uiMid << 3)]);
uiCurDrn = flmBigEndianToUINT32( &pBlk[ BH_OVHD + (uiMid << 3)]);
if( uiCurDrn == 0)
{
// Special case - at the end of a rightmost block.
@@ -537,9 +538,14 @@ RCODE FSBtScanNonLeafData(
// Remember a data record can span multiple blocks (same DRN).
while( uiMid)
{
uiCurDrn = byteToLong( &pBlk[ BH_OVHD + ((uiMid - 1) << 3)]);
uiCurDrn = flmBigEndianToUINT32(
&pBlk[ BH_OVHD + ((uiMid - 1) << 3)]);
if( uiDrn != uiCurDrn)
{
break;
}
uiMid--;
}
pStack->uiCmpStatus = BT_EQ_KEY;
@@ -576,7 +582,7 @@ RCODE FSBtScanNonLeafData(
// Set curElm and the key buffer.
pStack->uiCurElm = BH_OVHD + (uiMid << 3);
longToByte( uiCurDrn, pStack->pKeyBuf);
flmUINT32ToBigEndian( uiCurDrn, pStack->pKeyBuf);
//Exit:
return( rc);