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

2009-09-22 07:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbmemio/memio.c
    ! Fixed warnings reported by gcc and msvc.
      Please review me.
This commit is contained in:
Viktor Szakats
2009-09-22 05:44:11 +00:00
parent 084c037d63
commit 7f5ce57f2c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -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).

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

@@ -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;
}