From 7f5ce57f2cfaffe56afc7fddc546cd5db5814800 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 22 Sep 2009 05:44:11 +0000 Subject: [PATCH] 2009-09-22 07:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmemio/memio.c ! Fixed warnings reported by gcc and msvc. Please review me. --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbmemio/memio.c | 16 ++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8acc6ff647..29de4643d2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-22 07:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmemio/memio.c + ! Fixed warnings reported by gcc and msvc. + Please review me. + 2009-09-22 02:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/vm/maindllp.c ! Fixed for Unicode mode (msvc2010 x64). diff --git a/harbour/contrib/hbmemio/memio.c b/harbour/contrib/hbmemio/memio.c index 9d749c043f..5628a4fb0b 100644 --- a/harbour/contrib/hbmemio/memio.c +++ b/harbour/contrib/hbmemio/memio.c @@ -331,8 +331,10 @@ HB_MEMFS_EXPORT HB_FHANDLE hb_memfsOpen( const char * szName, USHORT uiFlags ) { /* truncate existing */ if( ulPos ) + { if( s_fs.pInodes[ ulPos - 1 ]->uiDeny & FOX_DENYWRITE ) uiError = 32; + } else uiError = 2; } @@ -347,21 +349,15 @@ HB_MEMFS_EXPORT HB_FHANDLE hb_memfsOpen( const char * szName, USHORT uiFlags ) { if( ulPos ) { - if( uiFlags & FOX_READ && s_fs.pInodes[ ulPos - 1 ]->uiDeny & FOX_DENYREAD || - uiFlags & FOX_WRITE && s_fs.pInodes[ ulPos - 1 ]->uiDeny & FOX_DENYWRITE || + if( ( uiFlags & FOX_READ && s_fs.pInodes[ ulPos - 1 ]->uiDeny & FOX_DENYREAD ) || + ( uiFlags & FOX_WRITE && s_fs.pInodes[ ulPos - 1 ]->uiDeny & FOX_DENYWRITE ) || s_fs.pInodes[ ulPos - 1 ]->uiDeny & uiFlags ) - { uiError = 32; - } else - { pFile = memfsFileAlloc( s_fs.pInodes[ ulPos - 1 ] ); - } } else - { pFile = memfsFileAlloc( memfsInodeAlloc( szName ) ); - } } s_error = uiError; @@ -545,12 +541,12 @@ HB_MEMFS_EXPORT void hb_memfsCommit( HB_FHANDLE pFile ) } -HB_MEMFS_EXPORT BOOL hb_memfsLock( HB_FHANDLE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLength, USHORT uiMode ) +HB_MEMFS_EXPORT BOOL hb_memfsLock( HB_FHANDLE pFile, HB_FOFFSET ulStart, HB_FOFFSET ulLength, int iMode ) { HB_SYMBOL_UNUSED( pFile ); HB_SYMBOL_UNUSED( ulStart ); HB_SYMBOL_UNUSED( ulLength ); - HB_SYMBOL_UNUSED( uiMode ); + HB_SYMBOL_UNUSED( iMode ); return 1; }