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

2007-10-27 16:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbapifs.h
   * source/rtl/fserror.c
   * source/rtl/philes.c
   * source/rtl/philes53.c
     ! Two FS API functions moved the hb_fs*() namespace:
       hb_getFError() -> hb_fsGetFError()
       hb_setFError() -> hb_fsSetFError()
This commit is contained in:
Viktor Szakats
2007-10-27 15:00:42 +00:00
parent 88cb3664a9
commit 0639e8b140
5 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -8,6 +8,15 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-10-27 16:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbapifs.h
* source/rtl/fserror.c
* source/rtl/philes.c
* source/rtl/philes53.c
! Two FS API functions moved the hb_fs*() namespace:
hb_getFError() -> hb_fsGetFError()
hb_setFError() -> hb_fsSetFError()
2007-10-27 16:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbapifs.h
* source/common/hbfsapi.c

8
harbour/include/hbapifs.h
View File

@@ -143,11 +143,11 @@ extern HB_EXPORT void hb_fsSetError ( USHORT uiError ); /* set the file sy
extern HB_EXPORT void hb_fsSetIOError ( BOOL fResult, USHORT uiOperation ); /* set the file system error number after IO operation */
extern HB_EXPORT USHORT hb_fsWrite ( FHANDLE hFileHandle, const BYTE * pBuff, USHORT ulCount ); /* write to an open file from a buffer (<=64K) */
extern HB_EXPORT ULONG hb_fsWriteLarge ( FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount ); /* write to an open file from a buffer (>64K) */
extern HB_EXPORT FHANDLE hb_fsPOpen( BYTE * pFilename, BYTE * pMode );
extern HB_EXPORT FHANDLE hb_fsPOpen ( BYTE * pFilename, BYTE * pMode );
extern HB_EXPORT FHANDLE hb_fsGetOsHandle( FHANDLE hFileHandle );
extern HB_EXPORT USHORT hb_getFError( void ); /* get FERROR() flag */
extern HB_EXPORT void hb_setFError( USHORT uiError ); /* set FERROR() flag */
extern HB_EXPORT BOOL hb_fsFileExists( const char * pszFileName ); /* check if a file exists (wildcard chars not accepted). */
extern HB_EXPORT USHORT hb_fsGetFError ( void ); /* get FERROR() flag */
extern HB_EXPORT void hb_fsSetFError ( USHORT uiError ); /* set FERROR() flag */
extern HB_EXPORT BOOL hb_fsFileExists ( const char * pszFileName ); /* check if a file exists (wildcard chars not accepted). */
#define hb_fsFLock( h, s, l ) hb_fsLock( h, s, l, FL_LOCK )
#define hb_fsFUnlock( h, s, l ) hb_fsLock( h, s, l, FL_UNLOCK )

8
harbour/source/rtl/fserror.c
View File

@@ -182,9 +182,9 @@ static int hb_WinToDosError( ULONG ulError )
#endif
/* return FERROR() code */
HB_EXPORT USHORT hb_getFError( void )
HB_EXPORT USHORT hb_fsGetFError( void )
{
HB_TRACE(HB_TR_DEBUG, ("hb_getFError()"));
HB_TRACE(HB_TR_DEBUG, ("hb_fsGetFError()"));
return s_uiFError;
}
@@ -206,9 +206,9 @@ HB_EXPORT USHORT hb_fsOsError( void )
}
/* set FERROR() code */
HB_EXPORT void hb_setFError( USHORT uiError )
HB_EXPORT void hb_fsSetFError( USHORT uiError )
{
HB_TRACE(HB_TR_DEBUG, ("hb_setFError(%hu)", uiError));
HB_TRACE(HB_TR_DEBUG, ("hb_fsSetFError(%hu)", uiError));
s_uiFError = uiError;
}

32
harbour/source/rtl/philes.c
View File

@@ -62,11 +62,11 @@ HB_FUNC( FOPEN )
{
hb_retni( hb_fsOpen( ( BYTE * ) hb_parc( 1 ),
ISNUM( 2 ) ? hb_parni( 2 ) : FO_READ | FO_COMPAT ) );
hb_setFError( hb_fsError() );
hb_fsSetFError( hb_fsError() );
}
else
{
hb_setFError( 0 );
hb_fsSetFError( 0 );
/* NOTE: Undocumented but existing Clipper Run-time error */
hb_errRT_BASE( EG_ARG, 2021, NULL, "FOPEN", HB_ERR_ARGS_BASEPARAMS );
}
@@ -78,12 +78,12 @@ HB_FUNC( FCREATE )
{
hb_retni( hb_fsCreate( ( BYTE * ) hb_parc( 1 ),
ISNUM( 2 ) ? hb_parni( 2 ) : FC_NORMAL ) );
hb_setFError( hb_fsError() );
hb_fsSetFError( hb_fsError() );
}
else
{
hb_retni( FS_ERROR );
hb_setFError( 0 );
hb_fsSetFError( 0 );
}
}
@@ -94,12 +94,12 @@ HB_FUNC( HB_FCREATE )
hb_retni( hb_fsCreateEx( ( BYTE * ) hb_parc( 1 ),
ISNUM( 2 ) ? hb_parni( 2 ) : FC_NORMAL,
ISNUM( 3 ) ? hb_parni( 3 ) : FO_COMPAT ) );
hb_setFError( hb_fsError() );
hb_fsSetFError( hb_fsError() );
}
else
{
hb_retni( FS_ERROR );
hb_setFError( 0 );
hb_fsSetFError( 0 );
}
}
@@ -137,7 +137,7 @@ HB_FUNC( FREAD )
}
hb_retnint( ulRead );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( FWRITE )
@@ -153,12 +153,12 @@ HB_FUNC( FWRITE )
}
else
hb_retnl( 0 );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( FERROR )
{
hb_retni( hb_getFError() );
hb_retni( hb_fsGetFError() );
}
HB_FUNC( FCLOSE )
@@ -172,7 +172,7 @@ HB_FUNC( FCLOSE )
}
else
hb_retl( FALSE );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( FERASE )
@@ -186,7 +186,7 @@ HB_FUNC( FERASE )
}
else
hb_retni( FS_ERROR );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( FRENAME )
@@ -201,7 +201,7 @@ HB_FUNC( FRENAME )
}
else
hb_retni( FS_ERROR );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( FSEEK )
@@ -218,7 +218,7 @@ HB_FUNC( FSEEK )
else
hb_retni( 0 );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( FREADSTR )
@@ -247,7 +247,7 @@ HB_FUNC( FREADSTR )
}
else
hb_retc( NULL );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
/* NOTE: This function should not return the leading and trailing */
@@ -276,7 +276,7 @@ HB_FUNC( HB_FEOF )
}
else
hb_retl( TRUE );
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( HB_FCOMMIT )
@@ -289,7 +289,7 @@ HB_FUNC( HB_FCOMMIT )
uiError = hb_fsError();
}
hb_setFError( uiError );
hb_fsSetFError( uiError );
}
HB_FUNC( HB_OSERROR )

2
harbour/source/rtl/philes53.c
View File

@@ -63,7 +63,7 @@ HB_FUNC( FSETDEVMOD )
if( ISNUM( 1 ) && ISNUM( 2 ) )
{
hb_fsSetDevMode( hb_parni( 1 ), hb_parni( 2 ) );
hb_setFError( hb_fsError() );
hb_fsSetFError( hb_fsError() );
}
/* NOTE: INCOMPATIBILITY! C53 will return the device flags
before applying the new setting, Harbour will