diff --git a/flaim/src/fblob.cpp b/flaim/src/fblob.cpp index 362fac4..776c083 100644 --- a/flaim/src/fblob.cpp +++ b/flaim/src/fblob.cpp @@ -130,7 +130,7 @@ RCODE FlmBlobImp::buildBlobHeader( ptr[ BLOB_H_VERSION_LEN_POS] = BLOB_CODE_VERSION; // 28 ptr[ BLOB_H_STORAGE_TYPE_POS] = (FLMBYTE) m_uiStorageType; - UW2FBA( m_uiFlags, &ptr[ BLOB_H_FLAGS_POS ]); + UW2FBA( (FLMUINT16)m_uiFlags, &ptr[ BLOB_H_FLAGS_POS ]); UW2FBA( BLOB_UNKNOWN_TYPE, &ptr[ BLOB_H_TYPE_POS ]); UW2FBA( 0, &ptr[ BLOB_H_FUTURE2 ]); UD2FBA( 0, &ptr[ BLOB_H_RAW_SIZE_POS ]); diff --git a/flaim/src/fcs.cpp b/flaim/src/fcs.cpp index d610103..637b2b5 100644 --- a/flaim/src/fcs.cpp +++ b/flaim/src/fcs.cpp @@ -4479,7 +4479,7 @@ RCODE flmGenerateHexPacket( // Encode the data size - UD2FBA( uiDataSize, &ucTmp[ 0]); + UD2FBA( (FLMUINT32)uiDataSize, &ucTmp[ 0]); for( uiLoop = 0; uiLoop < 4; uiLoop++) { bTmp = flmGetNextHexPacketSlot( pucUsedMap, uiBinPacketSize, @@ -6102,14 +6102,14 @@ RCODE FCS_WIRE::sendDrnList( // Set the item count. - UD2FBA( uiItemCount, pucItemPos); + UD2FBA( (FLMUINT32)uiItemCount, pucItemPos); pucItemPos += 4; // Put the items into the buffer. for( uiLoop = 0; uiLoop < uiItemCount; uiLoop++) { - UD2FBA( puiList[ uiLoop], pucItemPos); + UD2FBA( (FLMUINT32)puiList[ uiLoop], pucItemPos); pucItemPos += 4; } diff --git a/flaim/src/fdbcopy.cpp b/flaim/src/fdbcopy.cpp index 5258cb2..606b3ba 100644 --- a/flaim/src/fdbcopy.cpp +++ b/flaim/src/fdbcopy.cpp @@ -932,7 +932,7 @@ FSTATIC RCODE flmCopyFile( appear on ANY block. */ - UD2FBA( 0L, &ucLogHdr [LOG_CURR_TRANS_ID]); + UD2FBA( 0, &ucLogHdr [LOG_CURR_TRANS_ID]); /* Recalculate the log header checksum so that readers will not get a diff --git a/flaim/src/ffilehdr.cpp b/flaim/src/ffilehdr.cpp index 62f50e7..c21d54d 100644 --- a/flaim/src/ffilehdr.cpp +++ b/flaim/src/ffilehdr.cpp @@ -199,7 +199,7 @@ void flmInitFileHdrInfo( UW2FBA( (FLMUINT16)pFileHdr->uiBlockSize, &pFileHdrBuf [DB_BLOCK_SIZE]); pFileHdr->uiFirstLFHBlkAddr = FSBlkAddress(1, 0); - UD2FBA( pFileHdr->uiFirstLFHBlkAddr, &pFileHdrBuf [DB_1ST_LFH_ADDR]); + UD2FBA( (FLMUINT32)pFileHdr->uiFirstLFHBlkAddr, &pFileHdrBuf [DB_1ST_LFH_ADDR]); if (pFileHdr->uiVersionNum < FLM_FILE_FORMAT_VER_4_3) { @@ -209,9 +209,9 @@ void flmInitFileHdrInfo( FLMUINT uiFirstPcodeAddr = pFileHdr->uiFirstLFHBlkAddr + pFileHdr->uiBlockSize; - UD2FBA( pFileHdr->uiBlockSize, &pFileHdrBuf [DB_INIT_LOG_SEG_ADDR]); + UD2FBA( (FLMUINT32)pFileHdr->uiBlockSize, &pFileHdrBuf [DB_INIT_LOG_SEG_ADDR]); UD2FBA( DB_LOG_HEADER_START, &pFileHdrBuf [DB_LOG_HEADER_ADDR]); - UD2FBA( uiFirstPcodeAddr, &pFileHdrBuf [DB_1ST_PCODE_ADDR]); + UD2FBA( (FLMUINT32)uiFirstPcodeAddr, &pFileHdrBuf [DB_1ST_PCODE_ADDR]); } f_memcpy( pFileHdr->ucFileHdr, pFileHdrBuf, FLM_FILE_HEADER_SIZE); diff --git a/flaim/src/fgedcom.cpp b/flaim/src/fgedcom.cpp index d7e7d27..a778f6a 100644 --- a/flaim/src/fgedcom.cpp +++ b/flaim/src/fgedcom.cpp @@ -2822,7 +2822,7 @@ RCODE expWriteRec( if (bRootNode) { UW2FBA( (FLMUINT16) pRec->getContainerID(), &TBuf[14]); - UD2FBA( pRec->getID(), &TBuf[16]); + UD2FBA( (FLMUINT32)pRec->getID(), &TBuf[16]); uiTmpLen = 20; bRootNode = FALSE; diff --git a/flaim/src/filesys.h b/flaim/src/filesys.h index 6b1feca..e3bb754 100644 --- a/flaim/src/filesys.h +++ b/flaim/src/filesys.h @@ -439,7 +439,7 @@ struct UCUR; // B-tree chain end indicator - #define BT_END ((FLMUINT)0xFFFFFFFFL) + #define BT_END ((FLMUINT32)0xFFFFFFFF) // At the end of an element list diff --git a/flaim/src/flbackup.cpp b/flaim/src/flbackup.cpp index 52060f2..412fab5 100644 --- a/flaim/src/flbackup.cpp +++ b/flaim/src/flbackup.cpp @@ -597,16 +597,16 @@ FLMEXP RCODE FLMAPI FlmDbBackup( UD2FBA( FLM_BACKER_VERSION, &pucBlkBuf[ FLM_BACKER_VERSION_OFFSET]); - UD2FBA( uiBlockSize, + UD2FBA( (FLMUINT32)uiBlockSize, &pucBlkBuf[ FLM_BACKER_DB_BLOCK_SIZE_OFFSET]); uiMaxFileSize = flmGetMaxFileSize( pFBak->uiDbVersion, &pFBak->ucDbHeader [DB_LOG_HEADER_START]); - UD2FBA( uiMaxFileSize, + UD2FBA( (FLMUINT32)uiMaxFileSize, &pucBlkBuf[ FLM_BACKER_BFMAX_OFFSET]); - UD2FBA( FLM_BACKER_MTU_SIZE, + UD2FBA( (FLMUINT32)FLM_BACKER_MTU_SIZE, &pucBlkBuf[ FLM_BACKER_MTU_OFFSET]); f_timeGetSeconds( &uiTime); - UD2FBA( uiTime, + UD2FBA( (FLMUINT32)uiTime, &pucBlkBuf[ FLM_BACKER_TIME_OFFSET]); uiCount = f_strlen( (const char *)pFBak->ucDbPath); @@ -740,9 +740,9 @@ FLMEXP RCODE FLMAPI FlmDbBackup( f_memcpy( &pLogHdr[ LOG_LAST_CP_TRANS_ID], &pLogHdr[ LOG_CURR_TRANS_ID], 4); - UD2FBA( uiCPTransOffset, &pLogHdr[ LOG_RFL_LAST_CP_OFFSET]); - UD2FBA( ((FLMUINT32) uiBlockSize), &pLogHdr[ LOG_ROLLBACK_EOF]); - UD2FBA( (FLMUINT32)0, &pLogHdr[ LOG_PL_FIRST_CP_BLOCK_ADDR]); + UD2FBA( (FLMUINT32)uiCPTransOffset, &pLogHdr[ LOG_RFL_LAST_CP_OFFSET]); + UD2FBA( (FLMUINT32) uiBlockSize, &pLogHdr[ LOG_ROLLBACK_EOF]); + UD2FBA( 0, &pLogHdr[ LOG_PL_FIRST_CP_BLOCK_ADDR]); // Compute the log header checksum @@ -1037,7 +1037,7 @@ FLMEXP RCODE FLMAPI FlmDbBackupEnd( if( !pFBak->bCSMode) { - UD2FBA( pFBak->uiTransId, + UD2FBA( (FLMUINT32)pFBak->uiTransId, &pDb->pFile->ucUncommittedLogHdr [LOG_LAST_BACKUP_TRANS_ID]); } else @@ -1878,7 +1878,7 @@ FSTATIC RCODE flmRestoreFile( } else if( pucKeyToUse) { - UW2FBA( *puiKeyLen, &pLogHdr[ LOG_DATABASE_KEY_LEN]); + UW2FBA( (FLMUINT16)*puiKeyLen, &pLogHdr[ LOG_DATABASE_KEY_LEN]); f_memcpy( &pLogHdr[ LOG_DATABASE_KEY], pucKeyToUse, *puiKeyLen); } diff --git a/flaim/src/flcreate.cpp b/flaim/src/flcreate.cpp index 03ee893..4cf93b1 100644 --- a/flaim/src/flcreate.cpp +++ b/flaim/src/flcreate.cpp @@ -686,7 +686,7 @@ FSTATIC RCODE flmInitFileHdrs( // Initialize and output the first LFH block f_memset( pInitBuf, 0, uiBlkSize); - SET_BH_ADDR( pInitBuf, pFile->FileHdr.uiFirstLFHBlkAddr); + SET_BH_ADDR( pInitBuf, (FLMUINT32)pFile->FileHdr.uiFirstLFHBlkAddr); pInitBuf [BH_TYPE] = BHT_LFH_BLK; UD2FBA( (FLMUINT32)BT_END, &pInitBuf [BH_PREV_BLK]); UD2FBA( (FLMUINT32)BT_END, &pInitBuf [BH_NEXT_BLK]); @@ -714,7 +714,7 @@ FSTATIC RCODE flmInitFileHdrs( f_memset( pInitBuf, 0, uiBlkSize); uiPcodeAddr = pFile->FileHdr.uiFirstLFHBlkAddr + uiBlkSize; - SET_BH_ADDR( pInitBuf, uiPcodeAddr); + SET_BH_ADDR( pInitBuf, (FLMUINT32)uiPcodeAddr); pInitBuf [BH_TYPE] = BHT_PCODE_BLK; UD2FBA( (FLMUINT32)BT_END, &pInitBuf [BH_PREV_BLK]); UD2FBA( (FLMUINT32)BT_END, &pInitBuf [BH_NEXT_BLK]); diff --git a/flaim/src/flreduce.cpp b/flaim/src/flreduce.cpp index 475a063..67ff27a 100644 --- a/flaim/src/flreduce.cpp +++ b/flaim/src/flreduce.cpp @@ -675,7 +675,7 @@ FSTATIC RCODE FLRMoveBtreeBlk( &pFreeSCache->pucBlk [BH_PREV_BLK_ADDR]); f_memcpy( pFreeSCache->pucBlk, pucBlk, pFile->FileHdr.uiBlockSize); - SET_BH_ADDR( pucFreeBlk, uiFreeBlkAddr ); + SET_BH_ADDR( pucFreeBlk, (FLMUINT32)uiFreeBlkAddr ); // Restore the saved previous transaction ID and block address. @@ -745,7 +745,7 @@ FSTATIC RCODE FLRMoveBtreeBlk( goto Exit; } pucBlk = pSCache->pucBlk; - UD2FBA( uiFreeBlkAddr, &pucBlk [BH_NEXT_BLK ]); + UD2FBA( (FLMUINT32)uiFreeBlkAddr, &pucBlk [BH_NEXT_BLK ]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; } @@ -764,7 +764,7 @@ FSTATIC RCODE FLRMoveBtreeBlk( } pucBlk = pSCache->pucBlk; - UD2FBA( uiFreeBlkAddr, &pucBlk [BH_PREV_BLK ]); + UD2FBA( (FLMUINT32)uiFreeBlkAddr, &pucBlk [BH_PREV_BLK ]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; } @@ -926,7 +926,7 @@ FSTATIC RCODE FLRMovePcodeLFHBlk( &pFreeSCache->pucBlk [BH_PREV_BLK_ADDR]); f_memcpy( pFreeSCache->pucBlk, pucBlk, pFile->FileHdr.uiBlockSize); - SET_BH_ADDR( pucFreeBlk, uiFreeBlkAddr ); + SET_BH_ADDR( pucFreeBlk, (FLMUINT32)uiFreeBlkAddr); // Restore the saved previous transaction ID and block address. @@ -1008,7 +1008,7 @@ FSTATIC RCODE FLRMovePcodeLFHBlk( } pucBlk = pSCache->pucBlk; - UD2FBA( uiFreeBlkAddr, &pucBlk [BH_NEXT_BLK ]); + UD2FBA( (FLMUINT32)uiFreeBlkAddr, &pucBlk [BH_NEXT_BLK ]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; } @@ -1027,7 +1027,7 @@ FSTATIC RCODE FLRMovePcodeLFHBlk( } pucBlk = pSCache->pucBlk; - UD2FBA( uiFreeBlkAddr, &pucBlk [BH_PREV_BLK ]); + UD2FBA( (FLMUINT32)uiFreeBlkAddr, &pucBlk [BH_PREV_BLK ]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; } @@ -1143,7 +1143,7 @@ FSTATIC RCODE FLRFreeAvailBlk( pucLogHdr [LOG_PF_FIRST_BC_CNT]--; } - UD2FBA( uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); + UD2FBA( (FLMUINT32)uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; goto Exit; @@ -1175,7 +1175,7 @@ FSTATIC RCODE FLRFreeAvailBlk( pucBlk = pSCache->pucBlk; ALPutPBC( pucBlk, uiPbcAddr); - UD2FBA( uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); + UD2FBA( (FLMUINT32)uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; @@ -1194,7 +1194,7 @@ FSTATIC RCODE FLRFreeAvailBlk( } pucBlk = pSCache->pucBlk; - ALPutNBC( pucBlk, uiNbcAddr); + ALPutNBC( pucBlk, (FLMUINT32)uiNbcAddr); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; } @@ -1226,7 +1226,7 @@ FSTATIC RCODE FLRFreeAvailBlk( } pucBlk = pSCache->pucBlk; - UD2FBA( uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); + UD2FBA( (FLMUINT32)uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; @@ -1245,7 +1245,7 @@ FSTATIC RCODE FLRFreeAvailBlk( } pucBlk = pSCache->pucBlk; - ALPutNBC( pucBlk, uiNbcAddr); + ALPutNBC( pucBlk, (FLMUINT32)uiNbcAddr); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; } @@ -1296,9 +1296,9 @@ FSTATIC RCODE FLRFreeAvailBlk( } pucBlk = pSCache->pucBlk; - ALPutNBC( pucBlk, uiNbcAddr); - ALPutPBC( pucBlk, uiPbcAddr); - UD2FBA( uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); + ALPutNBC( pucBlk, (FLMUINT32)uiNbcAddr); + ALPutPBC( pucBlk, (FLMUINT32)uiPbcAddr); + UD2FBA( (FLMUINT32)uiNextBlkAddr, &pucBlk [BH_NEXT_BLK]); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; @@ -1317,7 +1317,7 @@ FSTATIC RCODE FLRFreeAvailBlk( } pucBlk = pSCache->pucBlk; - ALPutNBC( pucBlk, uiPrevBlkAddr); + ALPutNBC( pucBlk, (FLMUINT32)uiPrevBlkAddr); ScaReleaseCache( pSCache, FALSE); bReleaseCache = FALSE; } diff --git a/flaim/src/fqkeys.cpp b/flaim/src/fqkeys.cpp index 3c44c37..1ecc085 100644 --- a/flaim/src/fqkeys.cpp +++ b/flaim/src/fqkeys.cpp @@ -2028,7 +2028,7 @@ RCODE flmBuildFromAndUntilKeys( } else { - UD2FBA( iValue, pNumberBuf); + UD2FBA( (FLMUINT32)iValue, pNumberBuf); uiTempLen = 4; } break; @@ -2049,7 +2049,7 @@ RCODE flmBuildFromAndUntilKeys( } else { - UD2FBA( uiValue, pNumberBuf); + UD2FBA( (FLMUINT32)uiValue, pNumberBuf); uiTempLen = 4; } break; diff --git a/flaim/src/frebuild.cpp b/flaim/src/frebuild.cpp index 15c59ea..ed9e7e9 100644 --- a/flaim/src/frebuild.cpp +++ b/flaim/src/frebuild.cpp @@ -748,7 +748,7 @@ FSTATIC RCODE bldCheckBlock( // We don't do a block checksum calculation during rebuild, so at this // point, it still holds the low checksum byte. - SET_BH_ADDR( pStateInfo->pBlk, uiBlkAddress); + SET_BH_ADDR( pStateInfo->pBlk, (FLMUINT32)uiBlkAddress); if ((*peCorruptionCode = flmVerifyBlockHeader( pStateInfo, NULL, pHdrInfo->FileHdr.uiBlockSize, 0, uiPrevBlkAddress, FALSE, TRUE)) != FLM_NO_CORRUPTION) diff --git a/flaim/src/fsblk_u.cpp b/flaim/src/fsblk_u.cpp index a081fa4..0c9de9a 100644 --- a/flaim/src/fsblk_u.cpp +++ b/flaim/src/fsblk_u.cpp @@ -70,7 +70,7 @@ RCODE FSBlockUseNextAvail( pucBlkBuf = pSCache->pucBlk; pDb->LogHdr.uiFirstAvailBlkAddr = (FLMUINT) FB2UD( &pucBlkBuf[BH_NEXT_BLK]); - UD2FBA( pDb->LogHdr.uiFirstAvailBlkAddr, &pucLogHdr[LOG_PF_AVAIL_BLKS]); + UD2FBA( (FLMUINT32)pDb->LogHdr.uiFirstAvailBlkAddr, &pucLogHdr[LOG_PF_AVAIL_BLKS]); UD2FBA( 0, &pucBlkBuf[BH_NEXT_BLK]); // One less block in the avail list. @@ -91,7 +91,7 @@ RCODE FSBlockUseNextAvail( if (uiPbcAddr == BT_END) { - UD2FBA( BT_END, &pucLogHdr[LOG_PF_FIRST_BACKCHAIN]); + UD2FBA( (FLMUINT32)BT_END, &pucLogHdr[LOG_PF_FIRST_BACKCHAIN]); pucLogHdr[LOG_PF_FIRST_BC_CNT] = 0; } else @@ -122,7 +122,7 @@ RCODE FSBlockUseNextAvail( if (RC_OK( rc = ScaLogPhysBlk( pDb, &pPbcSCache))) { - ALPutNBC( pPbcSCache->pucBlk, BT_END); + ALPutNBC( pPbcSCache->pucBlk, (FLMUINT32)BT_END); } ScaReleaseCache( pPbcSCache, FALSE); @@ -190,7 +190,7 @@ RCODE FSBlockFree( UD2FBA( (FLMUINT32) uiFirstAvailAddress, &pucBlkBuf[BH_NEXT_BLK]); pucBlkBuf[BH_TYPE] = BHT_FREE; pucBlkBuf[BH_LEVEL] = 0; - UW2FBA( BH_OVHD, &pucBlkBuf[BH_ELM_END]); + UW2FBA( (FLMUINT16)BH_OVHD, &pucBlkBuf[BH_ELM_END]); // Wipe the contents of encrypted blocks... @@ -216,7 +216,7 @@ RCODE FSBlockFree( // Start over - increments to 1 below. pucLogHdr[LOG_PF_FIRST_BC_CNT] = 0; - ALPutNBC( pucBlkBuf, BT_END); + ALPutNBC( pucBlkBuf, (FLMUINT32)BT_END); // Increment and check if no avail blocks @@ -241,7 +241,7 @@ RCODE FSBlockFree( if (RC_OK( rc = ScaLogPhysBlk( pDb, &pPbcSCache))) { - ALPutNBC( pPbcSCache->pucBlk, uiBlkAddress); + ALPutNBC( pPbcSCache->pucBlk, (FLMUINT32)uiBlkAddress); } ScaReleaseCache( pPbcSCache, FALSE); @@ -303,7 +303,7 @@ RCODE FSBlockFixLinks( if (RC_OK( rc = ScaLogPhysBlk( pDb, &pSCache))) { - UD2FBA( uiNextBlkAddr, &pSCache->pucBlk[BH_NEXT_BLK]); + UD2FBA( (FLMUINT32)uiNextBlkAddr, &pSCache->pucBlk[BH_NEXT_BLK]); } ScaReleaseCache( pSCache, FALSE); @@ -327,7 +327,7 @@ RCODE FSBlockFixLinks( if (RC_OK( rc = ScaLogPhysBlk( pDb, &pSCache))) { - UD2FBA( uiPrevBlkAddr, &pSCache->pucBlk[BH_PREV_BLK]); + UD2FBA( (FLMUINT32)uiPrevBlkAddr, &pSCache->pucBlk[BH_PREV_BLK]); } ScaReleaseCache( pSCache, FALSE); diff --git a/flaim/src/fscomblk.cpp b/flaim/src/fscomblk.cpp index fa28b6c..64e4118 100644 --- a/flaim/src/fscomblk.cpp +++ b/flaim/src/fscomblk.cpp @@ -265,7 +265,7 @@ FSCB_Unpin: uiLeftBlkEnd += uiBytesAdded; tempStack.uiBlkEnd = uiLeftBlkEnd; - UW2FBA( uiLeftBlkEnd, &pLeftBlk[BH_BLK_END]); + UW2FBA( (FLMUINT16)uiLeftBlkEnd, &pLeftBlk[BH_BLK_END]); uiCompressBytes = FSBlkCompressPKC( &tempStack, pPkcBuf); @@ -287,7 +287,7 @@ FSCB_Unpin: } } - UD2FBA( uiRightBlkAddr, &pLeftBlk[BH_NEXT_BLK]); + UD2FBA( (FLMUINT32)uiRightBlkAddr, &pLeftBlk[BH_NEXT_BLK]); ScaReleaseCache( pLeftCache, FALSE); bReleaseLeft = FALSE; @@ -338,7 +338,7 @@ FSCB_Unpin: } } - UD2FBA( uiLeftBlkAddr, &pRightBlk[BH_PREV_BLK]); + UD2FBA( (FLMUINT32)uiLeftBlkAddr, &pRightBlk[BH_PREV_BLK]); ScaReleaseCache( pRightCache, FALSE); bReleaseRight = FALSE; @@ -450,7 +450,7 @@ RCODE FSBlkMoveElms( f_memmove( &pBlk[uiCurElm], pInsertElm, uiInsElmLen); pStack->uiBlkEnd += uiInsElmLen; - UW2FBA( pStack->uiBlkEnd, &pBlk[BH_BLK_END]); + UW2FBA( (FLMUINT16)pStack->uiBlkEnd, &pBlk[BH_BLK_END]); goto Exit; } @@ -481,7 +481,7 @@ RCODE FSBlkMoveElms( } uiNewBlkEnd = (FLMUINT) (pStack->uiBlkEnd + iDistanceToShiftDown); - UW2FBA( uiNewBlkEnd, &pBlk[BH_BLK_END]); + UW2FBA( (FLMUINT16)uiNewBlkEnd, &pBlk[BH_BLK_END]); pStack->uiBlkEnd = uiNewBlkEnd; // Move the first pInsertElm[] overhead values and key to where to be @@ -690,7 +690,7 @@ FSTATIC FLMINT FSBlkCompressPKC( return (0xFFFF); } - UW2FBA( uiBlkEnd, &pBlk[BH_BLK_END]); + UW2FBA( (FLMUINT16)uiBlkEnd, &pBlk[BH_BLK_END]); pStack->uiBlkEnd = uiBlkEnd; } diff --git a/flaim/src/fscounts.cpp b/flaim/src/fscounts.cpp index cbd520c..5f57992 100644 --- a/flaim/src/fscounts.cpp +++ b/flaim/src/fscounts.cpp @@ -647,7 +647,7 @@ RCODE FSUpdateBlkCounts( // The block should be able to be used. uiCount = uiCount - iDelta; - UD2FBA( uiCount, &pCurElm[ BNE_CHILD_COUNT]); + UD2FBA( (FLMUINT32)uiCount, &pCurElm[ BNE_CHILD_COUNT]); } Exit: @@ -702,7 +702,7 @@ RCODE FSChangeCount( } } - UD2FBA( uiCount, &pCurElm[ BNE_CHILD_COUNT]); + UD2FBA( (FLMUINT32)uiCount, &pCurElm[ BNE_CHILD_COUNT]); } Exit: @@ -745,7 +745,7 @@ RCODE FSChangeBlkCounts( // The block should be able to be used. - UD2FBA( uiCount, &pCurElm[ BNE_CHILD_COUNT]); + UD2FBA( (FLMUINT32)uiCount, &pCurElm[ BNE_CHILD_COUNT]); } Exit: diff --git a/flaim/src/fsdelelm.cpp b/flaim/src/fsdelelm.cpp index 37b57f9..43a2fde 100644 --- a/flaim/src/fsdelelm.cpp +++ b/flaim/src/fsdelelm.cpp @@ -486,7 +486,7 @@ RCODE FSNewLastBlkElm( goto Exit; } - UD2FBA( uiRefCount, &pElmBuffer[BNE_CHILD_COUNT]); + UD2FBA( (FLMUINT32)uiRefCount, &pElmBuffer[BNE_CHILD_COUNT]); } } @@ -785,12 +785,12 @@ void FSSetChildBlkAddr( if (uiBlkOvhd == BNE_KEY_START || uiBlkOvhd == BNE_KEY_COUNTS_START) { pChildAddr = pElement + BNE_CHILD_BLOCK; - UD2FBA( uiBlkAddr, pChildAddr); + UD2FBA( (FLMUINT32)uiBlkAddr, pChildAddr); } else if (uiBlkOvhd == BNE_DATA_OVHD) { pChildAddr = pElement + BNE_DATA_CHILD_BLOCK; - UD2FBA( uiBlkAddr, pChildAddr); + UD2FBA( (FLMUINT32)uiBlkAddr, pChildAddr); } return; diff --git a/flaim/src/fsinselm.cpp b/flaim/src/fsinselm.cpp index 3e894f8..d23974a 100644 --- a/flaim/src/fsinselm.cpp +++ b/flaim/src/fsinselm.cpp @@ -321,7 +321,7 @@ FSTATIC RCODE FSBlkInsElm( uiBlkEnd += uiNewElmLen; pStack->uiBlkEnd = uiBlkEnd; - UW2FBA( uiBlkEnd, BLK_ELM_ADDR( pStack, BH_ELM_END)); + UW2FBA( (FLMUINT16)uiBlkEnd, BLK_ELM_ADDR( pStack, BH_ELM_END)); rc = FERR_OK; } diff --git a/flaim/src/fslfile.cpp b/flaim/src/fslfile.cpp index 7c2d830..2504e84 100644 --- a/flaim/src/fslfile.cpp +++ b/flaim/src/fslfile.cpp @@ -122,8 +122,8 @@ RCODE flmLFileInit( *pElm = BBE_FIRST_FLAG | BBE_LAST_FLAG; pElm[ BBE_KL ] = 4; pElm[ BBE_RL ] = 4; - UD2FBA( DRN_LAST_MARKER, &pElm[ BBE_KEY ]); - UD2FBA( pLFile->uiNextDrn, &pElm[ BBE_KEY + 4 ]); + UD2FBA( (FLMUINT32)DRN_LAST_MARKER, &pElm[ BBE_KEY ]); + UD2FBA( (FLMUINT32)pLFile->uiNextDrn, &pElm[ BBE_KEY + 4 ]); uiBlkPos += DRN_LAST_MARKER_LEN; } @@ -133,7 +133,7 @@ RCODE flmLFileInit( pucBlk[ uiBlkPos + BBE_KL] = pucBlk[ uiBlkPos + BBE_RL] = 0; uiBlkPos += BBE_LEM_LEN; - UW2FBA( uiBlkPos, &pucBlk[ BH_ELM_END]); + UW2FBA( (FLMUINT16)uiBlkPos, &pucBlk[ BH_ELM_END]); // Release the cache block, because we are done with it @@ -293,8 +293,8 @@ FSTATIC RCODE flmLFileToBuffer( UW2FBA( (FLMUINT16) pLFile->uiLfNum, &pucBuf[ LFH_LF_NUMBER_OFFSET]); pucBuf[ LFH_TYPE_OFFSET] = (FLMBYTE) pLFile->uiLfType; - UD2FBA( pLFile->uiRootBlk, &pucBuf[ LFH_ROOT_BLK_OFFSET]); - UD2FBA( pLFile->uiNextDrn, &pucBuf[ LFH_NEXT_DRN_OFFSET]); + UD2FBA( (FLMUINT32)pLFile->uiRootBlk, &pucBuf[ LFH_ROOT_BLK_OFFSET]); + UD2FBA( (FLMUINT32)pLFile->uiNextDrn, &pucBuf[ LFH_NEXT_DRN_OFFSET]); // Set these for backwards compatibility. diff --git a/flaim/src/fsysdata.cpp b/flaim/src/fsysdata.cpp index 04febcb..048e2fe 100644 --- a/flaim/src/fsysdata.cpp +++ b/flaim/src/fsysdata.cpp @@ -177,7 +177,7 @@ FSTATIC void flmInitHashTbl( { for (uiCnt = 0; uiCnt < uiHashEntries - 1; uiCnt++) { - uiRandVal = f_getRandomUINT32( uiCnt, uiHashEntries - 1); + uiRandVal = f_getRandomUINT32( (FLMUINT32)uiCnt, (FLMUINT32)(uiHashEntries - 1)); if (uiRandVal != uiCnt) {