From a060eb3330346c2a9c0dcd630839eff8710ebd91 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Thu, 23 Mar 2006 22:51:01 +0000 Subject: [PATCH] Added typecasts for Solaris. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@209 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/src/fcs_dos.cpp | 4 ++-- flaim/src/fcs_wire.cpp | 4 ++-- flaim/src/flblddb.cpp | 2 +- flaim/src/flrddrct.cpp | 2 +- flaim/src/frec.cpp | 2 +- flaim/src/fsconvrt.cpp | 2 +- flaim/src/fsdatacu.cpp | 2 +- flaim/src/fslfileu.cpp | 6 +++--- flaim/src/fsrecget.cpp | 2 +- flaim/src/fsrecupd.cpp | 4 ++-- flaim/src/fssearch.cpp | 4 ++-- flaim/src/ftk.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/flaim/src/fcs_dos.cpp b/flaim/src/fcs_dos.cpp index db970d8..1a6d918 100644 --- a/flaim/src/fcs_dos.cpp +++ b/flaim/src/fcs_dos.cpp @@ -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))) diff --git a/flaim/src/fcs_wire.cpp b/flaim/src/fcs_wire.cpp index 1311193..517efbf 100644 --- a/flaim/src/fcs_wire.cpp +++ b/flaim/src/fcs_wire.cpp @@ -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; /* diff --git a/flaim/src/flblddb.cpp b/flaim/src/flblddb.cpp index 3e57363..397e22c 100644 --- a/flaim/src/flblddb.cpp +++ b/flaim/src/flblddb.cpp @@ -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))) { diff --git a/flaim/src/flrddrct.cpp b/flaim/src/flrddrct.cpp index 8541cfe..9dd62f5 100644 --- a/flaim/src/flrddrct.cpp +++ b/flaim/src/flrddrct.cpp @@ -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; diff --git a/flaim/src/frec.cpp b/flaim/src/frec.cpp index 8befc47..4791b48 100644 --- a/flaim/src/frec.cpp +++ b/flaim/src/frec.cpp @@ -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 && diff --git a/flaim/src/fsconvrt.cpp b/flaim/src/fsconvrt.cpp index 3d6f31e..cbbf388 100644 --- a/flaim/src/fsconvrt.cpp +++ b/flaim/src/fsconvrt.cpp @@ -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 { diff --git a/flaim/src/fsdatacu.cpp b/flaim/src/fsdatacu.cpp index ea89a1a..7eba78c 100644 --- a/flaim/src/fsdatacu.cpp +++ b/flaim/src/fsdatacu.cpp @@ -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, diff --git a/flaim/src/fslfileu.cpp b/flaim/src/fslfileu.cpp index 5322606..12452dc 100644 --- a/flaim/src/fslfileu.cpp +++ b/flaim/src/fslfileu.cpp @@ -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))) diff --git a/flaim/src/fsrecget.cpp b/flaim/src/fsrecget.cpp index b158d33..1ee7426 100644 --- a/flaim/src/fsrecget.cpp +++ b/flaim/src/fsrecget.cpp @@ -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); diff --git a/flaim/src/fsrecupd.cpp b/flaim/src/fsrecupd.cpp index 8172a65..b28670f 100644 --- a/flaim/src/fsrecupd.cpp +++ b/flaim/src/fsrecupd.cpp @@ -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 diff --git a/flaim/src/fssearch.cpp b/flaim/src/fssearch.cpp index f45d37b..e1e3261 100644 --- a/flaim/src/fssearch.cpp +++ b/flaim/src/fssearch.cpp @@ -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); diff --git a/flaim/src/ftk.h b/flaim/src/ftk.h index 64b2fe1..f47b857 100644 --- a/flaim/src/ftk.h +++ b/flaim/src/ftk.h @@ -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))))