fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-10-17 21:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/contrib/hbmemio/memio.c
    * casting for 64bit builds
This commit is contained in:
Przemyslaw Czerpak
2009-10-17 19:11:05 +00:00
parent c3e0439921
commit 8da0bb3c90
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -17,6 +17,10 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-10-17 21:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbmemio/memio.c
* casting for 64bit builds
2009-10-17 01:22 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/Makefile
+ harbour/src/rtl/hbbffnc.c

16
harbour/contrib/hbmemio/memio.c
View File

@@ -507,14 +507,14 @@ HB_MEMFS_EXPORT ULONG hb_memfsReadAt( HB_FHANDLE hFile, void * pBuff, ULONG ulCo
return 0;
HB_MEMFSMT_LOCK
if( pInode->llSize >= llOffset + ulCount )
if( pInode->llSize >= llOffset + ( HB_FOFFSET ) ulCount )
ulRead = ulCount;
else
ulRead = ( ULONG ) ( pInode->llSize - llOffset );
memcpy( pBuff, pInode->pData + ( ULONG ) llOffset, ulRead );
HB_MEMFSMT_UNLOCK
pFile->llPos = llOffset + ulCount;
pFile->llPos = llOffset + ( HB_FOFFSET ) ulCount;
return ulRead;
}
@@ -537,12 +537,12 @@ HB_MEMFS_EXPORT ULONG hb_memfsWriteAt( HB_FHANDLE hFile, const void * pBuff, ULO
HB_MEMFSMT_LOCK
/* Reallocate if neccesary */
if( pInode->llAlloc < llOffset + ulCount )
if( pInode->llAlloc < llOffset + ( HB_FOFFSET ) ulCount )
{
HB_FOFFSET llNewAlloc = pInode->llAlloc + ( pInode->llAlloc >> 1 );
if( llNewAlloc < llOffset + ulCount )
llNewAlloc = llOffset + ulCount;
if( llNewAlloc < llOffset + ( HB_FOFFSET ) ulCount )
llNewAlloc = llOffset + ( HB_FOFFSET ) ulCount;
pInode->pData = ( char * ) hb_xrealloc( pInode->pData, ( ULONG ) llNewAlloc );
memset( pInode->pData + ( ULONG ) pInode->llAlloc, 0, llNewAlloc - pInode->llAlloc );
@@ -550,11 +550,11 @@ HB_MEMFS_EXPORT ULONG hb_memfsWriteAt( HB_FHANDLE hFile, const void * pBuff, ULO
}
memcpy( pInode->pData + ( ULONG ) llOffset, pBuff, ulCount );
if( pInode->llSize < llOffset + ulCount )
pInode->llSize = llOffset + ulCount;
if( pInode->llSize < llOffset + ( HB_FOFFSET ) ulCount )
pInode->llSize = llOffset + ( HB_FOFFSET ) ulCount;
HB_MEMFSMT_UNLOCK
pFile->llPos = llOffset + ulCount;
pFile->llPos = llOffset + ( HB_FOFFSET ) ulCount;
return ulCount;
}