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

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

View File

@@ -1139,7 +1139,7 @@ eCorruptionType flmVerifyKey(
if (pIfd->uiFlags & IFD_COMPOUND)
{
if (byteToInt( &pKey [uiJ + 1]) != pIfd->uiFldNum)
if (flmBigEndianToUINT16( &pKey [uiJ + 1]) != pIfd->uiFldNum)
return( FLM_BAD_CONTEXT_KEY);
}
else
@@ -1157,7 +1157,7 @@ eCorruptionType flmVerifyKey(
uiH < uiTrueNumIxFields;
uiH++, pTmpIfd++)
{
if (byteToInt( &pKey[ uiJ + 1]) == pTmpIfd->uiFldNum)
if (flmBigEndianToUINT16( &pKey[ uiJ + 1]) == pTmpIfd->uiFldNum)
{
break;
}
@@ -1650,12 +1650,8 @@ eCorruptionType flmVerifyElement(
{
f_memcpy( &ucRecBuff [uiElmPKCLen], pElmKey, uiElmKeyLen);
}
//else if (uiBlkType == BHT_NON_LEAF_DATA)
//{
// *(FLMUINT32 *) ucRecBuff = *(FLMUINT32 *)pElmKey;
//}
pStateInfo->uiElmDrn = (FLMUINT)byteToLong( ucRecBuff);
pStateInfo->uiElmDrn = flmBigEndianToUINT32( ucRecBuff);
if (pStateInfo->uiElmDrn == DRN_LAST_MARKER && uiBlkType == BHT_LEAF)
{
FLMUINT uiTempDrn;