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

Added typecasts for Solaris.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@209 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-03-23 22:51:01 +00:00
parent adb3b66d95
commit a060eb3330
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flaim/src/fcs_dos.cpp
View File

@@ -329,11 +329,11 @@ RCODE FCS_DOS::writeHTD(
if( pCurNode)
{
flmUINT16ToBigEndian( GedTagNum( pCurNode), pucTmpBuf);
flmUINT16ToBigEndian( (FLMUINT16)GedTagNum( pCurNode), pucTmpBuf);
}
else if( pCurField)
{
flmUINT16ToBigEndian( pRecord->getFieldID( pCurField), pucTmpBuf);
flmUINT16ToBigEndian( (FLMUINT16)pRecord->getFieldID( pCurField), pucTmpBuf);
}
if( RC_BAD( rc = write( pucTmpBuf, 2)))

4
flaim/src/fcs_wire.cpp
View File

@@ -1178,10 +1178,10 @@ RCODE FCS_WIRE::sendRecord(
4-byte container ID, 4-byte DRN
*/
flmUINT32ToBigEndian( pRecord->getContainerID(), pucBufPos);
flmUINT32ToBigEndian( (FLMUINT32)pRecord->getContainerID(), pucBufPos);
pucBufPos += 4;
flmUINT32ToBigEndian( pRecord->getID(), pucBufPos);
flmUINT32ToBigEndian( (FLMUINT32)pRecord->getID(), pucBufPos);
pucBufPos += 4;
/*

2
flaim/src/flblddb.cpp
View File

@@ -425,7 +425,7 @@ FSTATIC RCODE bldAdjustNextDrn(
// Find the element whose DRN is DRN_LAST_MARKER
flmUINT32ToBigEndian( DRN_LAST_MARKER, DrnMarker);
flmUINT32ToBigEndian( (FLMUINT32)DRN_LAST_MARKER, DrnMarker);
if( RC_BAD( rc = FSBtSearch( pDb, pLFile, &pStack, DrnMarker,
DIN_KEY_SIZ, 0)))
{

2
flaim/src/flrddrct.cpp
View File

@@ -171,7 +171,7 @@ Search_Record:
{
goto Exit;
}
flmUINT32ToBigEndian( uiDrn, pSearchBuf);
flmUINT32ToBigEndian( (FLMUINT32)uiDrn, pSearchBuf);
FSInitStackCache( &stack [0], BH_MAX_LEVELS);
pStack = &stack[0];
bStackInitialized = TRUE;

2
flaim/src/frec.cpp
View File

@@ -1920,7 +1920,7 @@ RCODE FlmRecord::compactMemory( void)
flmAssert( uiLevelOneFldCount < uiFieldIdTableItemCount);
pFieldId->ui16FieldId = pFld->ui16FieldID;
pFieldId->ui32FieldOffset = uiSlot + 1;
pFieldId->ui32FieldOffset = (FLMUINT32)(uiSlot + 1);
uiLevelOneFldCount++;
if (uiLevelOneFldCount > 1 && !bNeedToSortFieldIdTable &&

2
flaim/src/fsconvrt.cpp
View File

@@ -334,7 +334,7 @@ FSTATIC void FSBuildNonLeafDataElement(
// Check for last element marker.
if( pOldElm[ BBE_PKC ] == 0 && pOldElm[ BBE_KL] == 0)
{
flmUINT32ToBigEndian( DRN_LAST_MARKER, pElement);
flmUINT32ToBigEndian( (FLMUINT32)DRN_LAST_MARKER, pElement);
}
else
{

2
flaim/src/fsdatacu.cpp
View File

@@ -714,7 +714,7 @@ RCODE FSDataCursor::setRecPosition(
pOutRecPos->pStack = pOutRecPos->Stack;
pOutRecPos->Stack[0].pKeyBuf = pOutRecPos->pKey;
uiRecordId = pInRecPos->uiRecordId;
flmUINT32ToBigEndian( uiRecordId, buf);
flmUINT32ToBigEndian( (FLMUINT32)uiRecordId, buf);
// All of the variables should be setup for the search.
if( RC_BAD( rc = FSBtSearch( pDb, m_pLFile, &pOutRecPos->pStack,

6
flaim/src/fslfileu.cpp
View File

@@ -890,7 +890,7 @@ RCODE flmIndexSetOfRecords(
uiLastDrn = 0;
pStack->pKeyBuf = ucKeyBuf;
flmUINT32ToBigEndian( uiStartDrn, ucSearchKey);
flmUINT32ToBigEndian( (FLMUINT32)uiStartDrn, ucSearchKey);
if (RC_BAD( rc = FSBtSearch( pDb, pDataLFile, &pStack,
ucSearchKey, 4, 0)))
@@ -1044,7 +1044,7 @@ RCODE flmIndexSetOfRecords(
FSInitStackCache( &stackBuf [0], BH_MAX_LEVELS);
pStack = stackBuf;
pStack->pKeyBuf = ucKeyBuf;
flmUINT32ToBigEndian( uiDrn, ucSearchKey);
flmUINT32ToBigEndian( (FLMUINT32)uiDrn, ucSearchKey);
if (RC_BAD( rc = FSBtSearch( pDb, pDataLFile, &pStack,
ucSearchKey, 4, 0)))
{
@@ -2719,7 +2719,7 @@ FSTATIC RCODE flmRetrieveTrackerRec(
}
pStack->pKeyBuf = ucKeyBuf;
flmUINT32ToBigEndian( uiDrn, ucSearchKey);
flmUINT32ToBigEndian( (FLMUINT32)uiDrn, ucSearchKey);
if( RC_BAD( rc = FSBtSearch(
pDb, pTrackerLFile, &pStack, ucSearchKey, 4, 0)))

2
flaim/src/fsrecget.cpp
View File

@@ -96,7 +96,7 @@ RCODE FSReadRecord( // Was FSRecordGet
pStack->pKeyBuf = pKeyBuf;
// Search the B-TREE for the record
flmUINT32ToBigEndian( uiDrn, pDrnBuf);
flmUINT32ToBigEndian( (FLMUINT32)uiDrn, pDrnBuf);
if( RC_OK( rc = FSBtSearch( pDb, pLFile, &pStack, pDrnBuf, 4, 0)))
{
rc = RC_SET( FERR_NOT_FOUND);

4
flaim/src/fsrecupd.cpp
View File

@@ -52,7 +52,7 @@ RCODE FSRecUpdate(
FSInitStackCache( &stackBuf [0], BH_MAX_LEVELS);
pStack->pKeyBuf = pKeyBuf;
flmUINT32ToBigEndian( uiDrn, updCur.pKeyBuf);
flmUINT32ToBigEndian( (FLMUINT32)uiDrn, updCur.pKeyBuf);
// Position to the element in the b-tree.
@@ -119,7 +119,7 @@ RCODE FSRecUpdate(
pElmBuf = updCur.pElmBuf;
pElmBuf[ BBE_PKC] = BBE_FIRST_FLAG;
pElmBuf[ BBE_KL] = DIN_KEY_SIZ;
flmUINT32ToBigEndian( uiDrn, &pElmBuf[ BBE_KEY]);
flmUINT32ToBigEndian( (FLMUINT32)uiDrn, &pElmBuf[ BBE_KEY]);
// BBE_RL is set in the flush routine

4
flaim/src/fssearch.cpp
View File

@@ -159,7 +159,7 @@ RCODE FSBtSearchEnd(
goto Exit;
}
flmUINT32ToBigEndian( uiDrn, key);
flmUINT32ToBigEndian( (FLMUINT32)uiDrn, key);
for(;;)
{
pStack->uiFlags = FULL_STACK;
@@ -582,7 +582,7 @@ RCODE FSBtScanNonLeafData(
// Set curElm and the key buffer.
pStack->uiCurElm = BH_OVHD + (uiMid << 3);
flmUINT32ToBigEndian( uiCurDrn, pStack->pKeyBuf);
flmUINT32ToBigEndian( (FLMUINT32)uiCurDrn, pStack->pKeyBuf);
//Exit:
return( rc);

2
flaim/src/ftk.h
View File

@@ -779,7 +779,7 @@
(((FLMUINT32)(((FLMUINT8 *)(bp))[1])) << 8) | \
(((FLMUINT32)(((FLMUINT8 *)(bp))[0])) ) ))
#define UW2FBA( uw, bp)
#define UW2FBA( uw, bp) \
(((FLMUINT8 *)(bp))[0] = ((FLMUINT8)(uw)), \
((FLMUINT8 *)(bp))[1] = ((FLMUINT8)((((uw) & 0xff00)>>8))))