2016-02-11 11:54 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* ChangeLog.txt
* include/hbapifs.h
* src/rtl/filesys.c
* cleaned hb_fsOpenEx() parameters order
* src/common/hbprintf.c
! typo in comment
This commit is contained in:
@@ -10,6 +10,15 @@
|
||||
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
|
||||
*/
|
||||
|
||||
2016-02-11 11:54 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
|
||||
* ChangeLog.txt
|
||||
* include/hbapifs.h
|
||||
* src/rtl/filesys.c
|
||||
* cleaned hb_fsOpenEx() parameters order
|
||||
|
||||
* src/common/hbprintf.c
|
||||
! typo in comment
|
||||
|
||||
2016-02-10 17:17 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
|
||||
* src/rtl/filesys.c
|
||||
* replaced hb_fsCreate() and hb_fsCreateEx() with wrappers
|
||||
@@ -424,8 +433,8 @@
|
||||
* include/hbapifs.h
|
||||
* src/rtl/filesys.c
|
||||
+ added new C function:
|
||||
HB_FHANDLE hb_fsOpenEx( const char * pszFileName, HB_FATTR nAttr,
|
||||
HB_USHORT uiFlags );
|
||||
HB_FHANDLE hb_fsOpenEx( const char * pszFileName, HB_USHORT uiFlags,
|
||||
HB_FATTR nAttr );
|
||||
* minor cleanup
|
||||
|
||||
* include/hbmemory.ch
|
||||
|
||||
@@ -151,7 +151,7 @@ extern HB_EXPORT int hb_fsLockTest ( HB_FHANDLE hFileHandle, HB_FOFFSE
|
||||
HB_FOFFSET nLength, HB_USHORT uiMode );
|
||||
extern HB_EXPORT HB_BOOL hb_fsMkDir ( const char * pszDirName ); /* create a directory */
|
||||
extern HB_EXPORT HB_FHANDLE hb_fsOpen ( const char * pszFileName, HB_USHORT uiFlags ); /* open a file */
|
||||
extern HB_EXPORT HB_FHANDLE hb_fsOpenEx ( const char * pszFileName, HB_FATTR nAttr, HB_USHORT uiFlags ); /* open or new create a file with given attributes */
|
||||
extern HB_EXPORT HB_FHANDLE hb_fsOpenEx ( const char * pszFileName, HB_USHORT uiFlags, HB_FATTR nAttr ); /* open or create a file with given attributes */
|
||||
extern HB_EXPORT HB_USHORT hb_fsRead ( HB_FHANDLE hFileHandle, void * pBuff, HB_USHORT uiCount ); /* read contents of a file into a buffer (<=64K) */
|
||||
extern HB_EXPORT HB_SIZE hb_fsReadLarge ( HB_FHANDLE hFileHandle, void * pBuff, HB_SIZE nCount ); /* read contents of a file into a buffer (>64K) */
|
||||
extern HB_EXPORT HB_SIZE hb_fsReadAt ( HB_FHANDLE hFileHandle, void * pBuff, HB_SIZE nCount, HB_FOFFSET nOffset ); /* read from given offset contents of a file into a buffer (>64K) */
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* hb_sprintf() function.
|
||||
* hb_snprintf() function.
|
||||
*
|
||||
* Copyright 2008 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
||||
*
|
||||
|
||||
@@ -1424,7 +1424,7 @@ HB_FHANDLE hb_fsCreate( const char * pszFileName, HB_FATTR nAttr )
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "hb_fsCreate(%s, %u)", pszFileName, nAttr ) );
|
||||
|
||||
return hb_fsOpenEx( pszFileName, nAttr, FO_READWRITE | FO_CREAT | FO_TRUNC | FO_EXCLUSIVE );
|
||||
return hb_fsOpenEx( pszFileName, FO_READWRITE | FO_CREAT | FO_TRUNC | FO_EXCLUSIVE, nAttr );
|
||||
}
|
||||
|
||||
HB_FHANDLE hb_fsCreateEx( const char * pszFileName, HB_FATTR nAttr, HB_USHORT uiFlags )
|
||||
@@ -1433,21 +1433,21 @@ HB_FHANDLE hb_fsCreateEx( const char * pszFileName, HB_FATTR nAttr, HB_USHORT ui
|
||||
|
||||
uiFlags &= ~( FO_READ | FO_WRITE | FO_READWRITE );
|
||||
|
||||
return hb_fsOpenEx( pszFileName, nAttr, FO_READWRITE | FO_CREAT | FO_TRUNC | uiFlags );
|
||||
return hb_fsOpenEx( pszFileName, FO_READWRITE | FO_CREAT | FO_TRUNC | uiFlags, nAttr );
|
||||
}
|
||||
|
||||
HB_FHANDLE hb_fsOpen( const char * pszFileName, HB_USHORT uiFlags )
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "hb_fsOpen(%s, %hu)", pszFileName, uiFlags ) );
|
||||
|
||||
return hb_fsOpenEx( pszFileName, FC_NORMAL, uiFlags );
|
||||
return hb_fsOpenEx( pszFileName, uiFlags, FC_NORMAL );
|
||||
}
|
||||
|
||||
HB_FHANDLE hb_fsOpenEx( const char * pszFileName, HB_FATTR nAttr, HB_USHORT uiFlags )
|
||||
HB_FHANDLE hb_fsOpenEx( const char * pszFileName, HB_USHORT uiFlags, HB_FATTR nAttr )
|
||||
{
|
||||
HB_FHANDLE hFileHandle;
|
||||
|
||||
HB_TRACE( HB_TR_DEBUG, ( "hb_fsOpenEx(%s, %u, %hu)", pszFileName, nAttr, uiFlags ) );
|
||||
HB_TRACE( HB_TR_DEBUG, ( "hb_fsOpenEx(%s, %hu, %u)", pszFileName, uiFlags, nAttr ) );
|
||||
|
||||
#if defined( HB_OS_WIN )
|
||||
{
|
||||
@@ -4451,7 +4451,7 @@ HB_FHANDLE hb_fsExtOpen( const char * pszFileName, const char * pDefExt,
|
||||
uiFlags |= FO_TRUNC;
|
||||
}
|
||||
|
||||
hFile = hb_fsOpenEx( szPath, FC_NORMAL, uiFlags );
|
||||
hFile = hb_fsOpenEx( szPath, uiFlags, FC_NORMAL );
|
||||
|
||||
#if defined( HB_USE_SHARELOCKS )
|
||||
if( hFile != FS_ERROR && ( nExFlags & FXO_SHARELOCK ) != 0 )
|
||||
|
||||
Reference in New Issue
Block a user