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

Changes to use new endian inlines from FTK.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@460 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-05-25 15:26:08 +00:00
parent abc5c5650e
commit 96edbc5f55
7 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xflaim/Makefile
View File

@@ -1794,16 +1794,6 @@ dist: status clean dircheck srcdist
$(ec)$(call rmcmd,$(package_dir)/$(src_package_name))
$(ec)$(gprintf) "Distribution created.\n"
# -- pathinfo --
.PHONY : pathinfo
pathinfo:
$(ec)$(gprintf) "srcpackage = $(call ppath,$(src_package_dir)/$(src_package_name))\n"
$(ec)$(gprintf) "binpackage = $(call ppath,$(bin_package_dir)/$(bin_package_name))\n"
$(ec)$(gprintf) "rpm = $(call ppath,$(package_rpms_dir)/$(HOSTTYPE)/$(rpm_name))\n"
$(ec)$(gprintf) "srcrpm = $(call ppath,$(package_srpms_dir)/$(srpm_name))\n"
$(ec)$(gprintf) "develrpm = $(call ppath,$(package_rpms_dir)/$(HOSTTYPE)/$(develrpm_name))\n"
# -- Change log --
.PHONY : changelog

16
xflaim/src/flaimsys.h
View File

@@ -8275,10 +8275,10 @@ private:
{
pucBuffer[ 0] = ucPrefix;
f_UINT32ToByte( (FLMUINT32)uiCollection, &pucBuffer[ 1]);
f_UINT64ToByte( ui64NodeId, &pucBuffer[ 5]);
f_UINT32ToByte( (FLMUINT32)uiBlockAddr, &pucBuffer[ 13]);
f_UINT32ToByte( (FLMUINT32)uiElmNumber, &pucBuffer[ 17]);
f_UINT32ToBigEndian( (FLMUINT32)uiCollection, &pucBuffer[ 1]);
f_UINT64ToBigEndian( ui64NodeId, &pucBuffer[ 5]);
f_UINT32ToBigEndian( (FLMUINT32)uiBlockAddr, &pucBuffer[ 13]);
f_UINT32ToBigEndian( (FLMUINT32)uiElmNumber, &pucBuffer[ 17]);
}
FINLINE void extractRSetEntry(
@@ -8290,22 +8290,22 @@ private:
{
if( puiCollection)
{
*puiCollection = f_byteToUINT32( &pucBuffer[ 1]);
*puiCollection = f_bigEndianToUINT32( &pucBuffer[ 1]);
}
if( pui64NodeId)
{
*pui64NodeId = f_byteToUINT64( &pucBuffer[ 5]);
*pui64NodeId = f_bigEndianToUINT64( &pucBuffer[ 5]);
}
if( puiBlockAddr)
{
*puiBlockAddr = f_byteToUINT32( &pucBuffer[ 13]);
*puiBlockAddr = f_bigEndianToUINT32( &pucBuffer[ 13]);
}
if( puiElmNumber)
{
*puiElmNumber = f_byteToUINT32( &pucBuffer[ 17]);
*puiElmNumber = f_bigEndianToUINT32( &pucBuffer[ 17]);
}
}

8
xflaim/src/flblddb.cpp
View File

@@ -231,8 +231,8 @@ class F_NodeResultSetCompare : public IF_ResultSetCompare
}
else
{
uiCollection1 = f_byteToUINT32( &pucData1[ 1]);
uiCollection2 = f_byteToUINT32( &pucData2[ 1]);
uiCollection1 = f_bigEndianToUINT32( &pucData1[ 1]);
uiCollection2 = f_bigEndianToUINT32( &pucData2[ 1]);
if( uiCollection1 < uiCollection2)
{
@@ -244,8 +244,8 @@ class F_NodeResultSetCompare : public IF_ResultSetCompare
}
else
{
ui64NodeId1 = f_byteToUINT64( &pucData1[ 5]);
ui64NodeId2 = f_byteToUINT64( &pucData2[ 5]);
ui64NodeId1 = f_bigEndianToUINT64( &pucData1[ 5]);
ui64NodeId2 = f_bigEndianToUINT64( &pucData2[ 5]);
if( ui64NodeId1 < ui64NodeId2)
{

2
xflaim/src/fqsort.cpp
View File

@@ -432,7 +432,7 @@ RCODE F_Query::addToResultSet( void)
flmAssert( m_bPositioningEnabled);
ui32Count++;
f_UINT32ToByte( ui32Count, ucKey);
f_UINT32ToBigEndian( ui32Count, ucKey);
pucTmp = &ucKey [4];
if (RC_BAD( rc = m_pCurrDoc->getDocumentId( (IF_Db *)m_pDb, &ui64DocId)))
{

5
xflaim/src/fvector.cpp
View File

@@ -965,7 +965,7 @@ RCODE F_DataVector::outputKey(
goto Exit;
}
f_UINT32ToByte( (FLMUINT32)uiNum, pucToKey);
f_UINT32ToBigEndian( (FLMUINT32)uiNum, pucToKey);
uiToKeyLen = 4;
}
else if (pIcd->uiFlags & ICD_METAPHONE)
@@ -1260,7 +1260,8 @@ RCODE F_DataVector::inputKey(
rc = RC_SET_AND_ASSERT( NE_XFLM_BTREE_ERROR);
goto Exit;
}
uiNum = (FLMUINT)f_byteToUINT32( pucKey);
uiNum = (FLMUINT)f_bigEndianToUINT32( pucKey);
// What is stored in the key better match the dictionary
// number of the ICD.

2
xflaim/src/kybldkey.cpp
View File

@@ -226,7 +226,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece(
if (pIcd->uiFlags & ICD_PRESENCE)
{
f_UINT32ToByte( (FLMUINT32)pIcd->uiDictNum, pucFromKey);
f_UINT32ToBigEndian( (FLMUINT32)pIcd->uiDictNum, pucFromKey);
uiFromKeyLen = uiUntilKeyLen = 4;
f_memcpy( pucUntilKey, pucFromKey, uiUntilKeyLen);
}

3
xflaim/src/kybuild.cpp
View File

@@ -1479,7 +1479,8 @@ No_Data:
}
}
f_UINT32ToByte( (FLMUINT32)uiNameId, &m_keyGenInfo.pucKeyBuf [uiKeyLen]);
f_UINT32ToBigEndian( (FLMUINT32)uiNameId,
&m_keyGenInfo.pucKeyBuf [uiKeyLen]);
uiKeyLen += 4;
// Save the key component length.