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

2010-06-19 12:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/rtl/filesys.c
    * minor cleanup in recent modification
This commit is contained in:
Przemyslaw Czerpak
2010-06-19 10:58:34 +00:00
parent 73eae980a9
commit a46effd019
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -16,6 +16,10 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-19 12:58 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/filesys.c
* minor cleanup in recent modification
2010-06-19 12:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/itemapi.c
* src/vm/arrays.c

23
harbour/src/rtl/filesys.c
View File

@@ -1849,9 +1849,10 @@ HB_SIZE hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, HB_SIZE nCount, HB_FO
#if defined( HB_FS_FILE_IO )
hb_vmUnlock();
# if defined( HB_OS_UNIX ) && !defined( __WATCOMC__ )
{
hb_vmUnlock();
# if defined( HB_USE_LARGEFILE64 )
nRead = pread64( hFileHandle, pBuff, nCount, llOffset );
# else
@@ -1860,18 +1861,16 @@ HB_SIZE hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, HB_SIZE nCount, HB_FO
hb_fsSetIOError( nRead != ( HB_SIZE ) -1, 0 );
if( nRead == ( HB_SIZE ) -1 )
nRead = 0;
hb_vmLock();
}
# else
nRead = 0;
hb_vmUnlock();
# if defined( HB_OS_WIN )
{
# if defined( HB_OS_WIN_64 )
{
HANDLE hWFileHandle = DosToWinHandle( hFileHandle );
OVERLAPPED Overlapped;
BOOL bResult = HB_FALSE;
BOOL bResult = TRUE;
memset( &Overlapped, 0, sizeof( Overlapped ) );
Overlapped.Offset = ( DWORD ) ( llOffset & 0xFFFFFFFF );
@@ -1966,8 +1965,10 @@ HB_SIZE hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, HB_SIZE nCount, HB_FO
if( hb_fsSeekLarge( hFileHandle, llOffset, FS_SET ) == llOffset )
nRead = hb_fsReadLarge( hFileHandle, pBuff, nCount );
# endif
hb_vmLock();
# endif
hb_vmLock();
#else
nRead = 0;
@@ -1986,9 +1987,10 @@ HB_SIZE hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, HB_SIZE nCount
#if defined( HB_FS_FILE_IO )
hb_vmUnlock();
# if defined( HB_OS_UNIX ) && !defined( __WATCOMC__ )
{
hb_vmUnlock();
# if defined( HB_USE_LARGEFILE64 )
nWritten = pwrite64( hFileHandle, pBuff, nCount, llOffset );
# else
@@ -1997,18 +1999,16 @@ HB_SIZE hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, HB_SIZE nCount
hb_fsSetIOError( nWritten != ( HB_SIZE ) -1, 0 );
if( nWritten == ( HB_SIZE ) -1 )
nWritten = 0;
hb_vmLock();
}
# else
nWritten = 0;
hb_vmUnlock();
# if defined( HB_OS_WIN )
{
# if defined( HB_OS_WIN_64 )
{
HANDLE hWFileHandle = DosToWinHandle( hFileHandle );
OVERLAPPED Overlapped;
BOOL bResult = HB_FALSE;
BOOL bResult = TRUE;
memset( &Overlapped, 0, sizeof( Overlapped ) );
Overlapped.Offset = ( DWORD ) ( llOffset & 0xFFFFFFFF );
@@ -2104,9 +2104,10 @@ HB_SIZE hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, HB_SIZE nCount
if( hb_fsSeekLarge( hFileHandle, llOffset, FS_SET ) == llOffset )
nWritten = hb_fsWriteLarge( hFileHandle, pBuff, nCount );
# endif
hb_vmLock();
# endif
hb_vmLock();
#else
nWritten = 0;
@@ -2218,7 +2219,7 @@ void hb_fsCommit( HB_FHANDLE hFileHandle )
pointed by this descriptor are removed. It doesn't matter they
were done using different descriptor. It means that we now clean
all locks on hFileHandle with the code below if the OS is POSIX
compilant. I vote to disable it.
compilant. I vote to disable it. [druzus]
*/
{
int dup_handle;