From fdc45052474518941e2969f515e3b96db29e7253 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 16 Nov 2009 10:32:49 +0000 Subject: [PATCH] 2009-11-16 11:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/common/hbffind.c * src/rtl/fscopy.c * src/rtl/fserr.c * src/rtl/hbfeof.c * src/rtl/errapi.c * src/rtl/hbsocket.c * src/rtl/filesys.c * src/rtl/philes.c * src/rtl/dirdrive.c * src/rtl/filebuf.c * src/rtl/hbproces.c * include/hbstack.h * include/hbapifs.h * include/hbapierr.h * Changed USHORT type for error codes to HB_ERRCODE. + More or less changed int type of Extend/Item API call to long type to prepare for HB_ERRCODE change to ULONG. ; TODO: Rename variables to reflect new type. ; TODO: Change internal error code from ULONG to HB_ERRCODE. ; TODO: Inspect rest of Harbour like above. I've only dealt with rtl, vm. ; TODO: hbnetio protocol needs to be modified to pass errcode as 32 bit value. ; NOTE: There is still disagreement in code in few places in error type and 'int' is used internally, f.e. sockets, some internal OS code conversion funtions. ; TODO: Different topic, but we use a lot of USHORTs to store modes, tries, severity, operation, flags and few other things which would better be stored as simple int probably. ; Please review me. --- harbour/ChangeLog | 33 +++++++++++ harbour/include/hbapierr.h | 42 ++++++------- harbour/include/hbapifs.h | 16 ++--- harbour/include/hbstack.h | 10 ++-- harbour/src/common/hbffind.c | 2 +- harbour/src/rtl/dirdrive.c | 12 ++-- harbour/src/rtl/errapi.c | 110 +++++++++++++++++------------------ harbour/src/rtl/filebuf.c | 2 +- harbour/src/rtl/filesys.c | 85 ++++++++++++++------------- harbour/src/rtl/fscopy.c | 2 +- harbour/src/rtl/fserr.c | 16 ++--- harbour/src/rtl/hbfeof.c | 3 +- harbour/src/rtl/hbproces.c | 20 +++---- harbour/src/rtl/hbsocket.c | 4 +- harbour/src/rtl/philes.c | 22 +++---- 15 files changed, 207 insertions(+), 172 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 38c50dc420..f695db9c2f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,39 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-16 11:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/common/hbffind.c + * src/rtl/fscopy.c + * src/rtl/fserr.c + * src/rtl/hbfeof.c + * src/rtl/errapi.c + * src/rtl/hbsocket.c + * src/rtl/filesys.c + * src/rtl/philes.c + * src/rtl/dirdrive.c + * src/rtl/filebuf.c + * src/rtl/hbproces.c + * include/hbstack.h + * include/hbapifs.h + * include/hbapierr.h + * Changed USHORT type for error codes to HB_ERRCODE. + + More or less changed int type of Extend/Item API call to + long type to prepare for HB_ERRCODE change to ULONG. + ; TODO: Rename variables to reflect new type. + ; TODO: Change internal error code from ULONG to HB_ERRCODE. + ; TODO: Inspect rest of Harbour like above. I've only dealt with + rtl, vm. + ; TODO: hbnetio protocol needs to be modified to pass errcode + as 32 bit value. + ; NOTE: There is still disagreement in code in few places + in error type and 'int' is used internally, f.e. + sockets, some internal OS code conversion funtions. + ; TODO: Different topic, but we use a lot of USHORTs to + store modes, tries, severity, operation, flags and + few other things which would better be stored as + simple int probably. + ; Please review me. + 2009-11-16 09:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/beos/gcc.mk * config/bsd/gcc.mk diff --git a/harbour/include/hbapierr.h b/harbour/include/hbapierr.h index 96443d380c..d82264c61c 100644 --- a/harbour/include/hbapierr.h +++ b/harbour/include/hbapierr.h @@ -104,11 +104,11 @@ extern HB_EXPORT PHB_ITEM hb_errGetArgs ( PHB_ITEM pError ); extern HB_EXPORT const char * hb_errGetDescription ( PHB_ITEM pError ); extern HB_EXPORT const char * hb_errGetFileName ( PHB_ITEM pError ); extern HB_EXPORT USHORT hb_errGetFlags ( PHB_ITEM pError ); -extern HB_EXPORT USHORT hb_errGetGenCode ( PHB_ITEM pError ); +extern HB_EXPORT HB_ERRCODE hb_errGetGenCode ( PHB_ITEM pError ); extern HB_EXPORT const char * hb_errGetOperation ( PHB_ITEM pError ); -extern HB_EXPORT USHORT hb_errGetOsCode ( PHB_ITEM pError ); +extern HB_EXPORT HB_ERRCODE hb_errGetOsCode ( PHB_ITEM pError ); extern HB_EXPORT USHORT hb_errGetSeverity ( PHB_ITEM pError ); -extern HB_EXPORT USHORT hb_errGetSubCode ( PHB_ITEM pError ); +extern HB_EXPORT HB_ERRCODE hb_errGetSubCode ( PHB_ITEM pError ); extern HB_EXPORT const char * hb_errGetSubSystem ( PHB_ITEM pError ); extern HB_EXPORT USHORT hb_errGetTries ( PHB_ITEM pError ); extern HB_EXPORT USHORT hb_errLaunch ( PHB_ITEM pError ); @@ -119,11 +119,11 @@ extern HB_EXPORT PHB_ITEM hb_errPutArgs ( PHB_ITEM pError, ULONG u extern HB_EXPORT PHB_ITEM hb_errPutDescription ( PHB_ITEM pError, const char * szDescription ); extern HB_EXPORT PHB_ITEM hb_errPutFileName ( PHB_ITEM pError, const char * szFileName ); extern HB_EXPORT PHB_ITEM hb_errPutFlags ( PHB_ITEM pError, USHORT uiFlags ); -extern HB_EXPORT PHB_ITEM hb_errPutGenCode ( PHB_ITEM pError, USHORT uiGenCode ); +extern HB_EXPORT PHB_ITEM hb_errPutGenCode ( PHB_ITEM pError, HB_ERRCODE uiGenCode ); extern HB_EXPORT PHB_ITEM hb_errPutOperation ( PHB_ITEM pError, const char * szOperation ); -extern HB_EXPORT PHB_ITEM hb_errPutOsCode ( PHB_ITEM pError, USHORT uiOsCode ); +extern HB_EXPORT PHB_ITEM hb_errPutOsCode ( PHB_ITEM pError, HB_ERRCODE uiOsCode ); extern HB_EXPORT PHB_ITEM hb_errPutSeverity ( PHB_ITEM pError, USHORT uiSeverity ); -extern HB_EXPORT PHB_ITEM hb_errPutSubCode ( PHB_ITEM pError, USHORT uiSubCode ); +extern HB_EXPORT PHB_ITEM hb_errPutSubCode ( PHB_ITEM pError, HB_ERRCODE uiSubCode ); extern HB_EXPORT PHB_ITEM hb_errPutSubSystem ( PHB_ITEM pError, const char * szSubSystem ); extern HB_EXPORT PHB_ITEM hb_errPutTries ( PHB_ITEM pError, USHORT uiTries ); extern HB_EXPORT void hb_errRelease ( PHB_ITEM pError ); @@ -137,35 +137,35 @@ extern HB_EXPORT PHB_ITEM hb_errLaunchSubst( PHB_ITEM pError ); extern HB_EXPORT PHB_ITEM hb_errRT_New( USHORT uiSeverity, const char * szSubSystem, - ULONG ulGenCode, - ULONG ulSubCode, + HB_ERRCODE ulGenCode, + HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, - USHORT uiOsCode, + HB_ERRCODE uiOsCode, USHORT uiFlags ); extern HB_EXPORT PHB_ITEM hb_errRT_New_Subst( USHORT uiSeverity, const char * szSubSystem, - ULONG ulGenCode, - ULONG ulSubCode, + HB_ERRCODE ulGenCode, + HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, - USHORT uiOsCode, + HB_ERRCODE uiOsCode, USHORT uiFlags ); -extern HB_EXPORT PHB_ITEM hb_errRT_SubstParams( const char *szSubSystem, ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation ); +extern HB_EXPORT PHB_ITEM hb_errRT_SubstParams( const char * szSubSystem, HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation ); extern HB_EXPORT PHB_ITEM hb_errRT_FileError( PHB_ITEM pError, const char * szSubSystem, - ULONG ulGenCode, ULONG ulSubCode, + HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szFileName ); -extern HB_EXPORT USHORT hb_errRT_BASE ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ); -extern HB_EXPORT USHORT hb_errRT_BASE_Ext1 ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiOsCode, USHORT uiFlags, ULONG ulArgCount, ... ); -extern HB_EXPORT PHB_ITEM hb_errRT_BASE_Subst ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ); -extern HB_EXPORT void hb_errRT_BASE_SubstR ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ); -extern HB_EXPORT USHORT hb_errRT_TERM ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiOSCode, USHORT uiFlags ); -extern HB_EXPORT USHORT hb_errRT_DBCMD ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation ); -extern HB_EXPORT USHORT hb_errRT_DBCMD_Ext ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiFlags ); +extern HB_EXPORT USHORT hb_errRT_BASE ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ); +extern HB_EXPORT USHORT hb_errRT_BASE_Ext1 ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, HB_ERRCODE uiOsCode, USHORT uiFlags, ULONG ulArgCount, ... ); +extern HB_EXPORT PHB_ITEM hb_errRT_BASE_Subst ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ); +extern HB_EXPORT void hb_errRT_BASE_SubstR ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ); +extern HB_EXPORT USHORT hb_errRT_TERM ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, HB_ERRCODE uiOSCode, USHORT uiFlags ); +extern HB_EXPORT USHORT hb_errRT_DBCMD ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation ); +extern HB_EXPORT USHORT hb_errRT_DBCMD_Ext ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, USHORT uiFlags ); extern HB_EXPORT void hb_errInternal ( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ) HB_NORETURN_ATTR; extern void hb_errInternalRaw ( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ); diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h index 85946aa18b..fc5c802a7e 100644 --- a/harbour/include/hbapifs.h +++ b/harbour/include/hbapifs.h @@ -155,7 +155,7 @@ HB_EXTERN_BEGIN HB_FA_POSIX_SID(a) ) extern HB_EXPORT BOOL hb_fsChDir ( const char * pszDirName ); /* change working directory */ -extern HB_EXPORT USHORT hb_fsChDrv ( BYTE nDrive ); /* change working drive */ +extern HB_EXPORT HB_ERRCODE hb_fsChDrv ( BYTE nDrive ); /* change working drive */ extern HB_EXPORT void hb_fsClose ( HB_FHANDLE hFileHandle ); /* close a file */ extern HB_EXPORT void hb_fsCommit ( HB_FHANDLE hFileHandle ); /* commit updates of a file */ extern HB_EXPORT HB_FHANDLE hb_fsCreate ( const char * pszFileName, ULONG ulAttr ); /* create a file */ @@ -163,13 +163,13 @@ extern HB_EXPORT HB_FHANDLE hb_fsCreateEx ( const char * pszFilename, ULONG u extern HB_EXPORT HB_FHANDLE hb_fsCreateTemp ( const char * pszDir, const char * pszPrefix, ULONG ulAttr, char * pszName ); /* create a temporary file from components */ extern HB_EXPORT HB_FHANDLE hb_fsCreateTempEx( char * pszName, const char * pszDir, const char * pszPrefix, const char * pszExt, ULONG ulAttr ); /* create a temporary file from components */ extern HB_EXPORT const char * hb_fsCurDir ( USHORT uiDrive ); /* retrieve a static pointer containing current directory for specified drive */ -extern HB_EXPORT USHORT hb_fsCurDirBuff ( USHORT uiDrive, char * pbyBuffer, ULONG ulLen ); /* copy current directory for given drive into a buffer */ +extern HB_EXPORT HB_ERRCODE hb_fsCurDirBuff ( USHORT uiDrive, char * pbyBuffer, ULONG ulLen ); /* copy current directory for given drive into a buffer */ extern HB_EXPORT void hb_fsBaseDirBuff ( char * pbyBuffer ); /* retrieve the base dir of the executable */ extern HB_EXPORT BYTE hb_fsCurDrv ( void ); /* retrieve current drive number */ extern HB_EXPORT BOOL hb_fsDelete ( const char * pszFileName ); /* delete a file */ extern HB_EXPORT BOOL hb_fsEof ( HB_FHANDLE hFileHandle ); /* determine if an open file is position at end-of-file */ -extern HB_EXPORT USHORT hb_fsError ( void ); /* retrieve file system error */ -extern HB_EXPORT USHORT hb_fsOsError ( void ); /* retrieve system dependant file system error */ +extern HB_EXPORT HB_ERRCODE hb_fsError ( void ); /* retrieve file system error */ +extern HB_EXPORT HB_ERRCODE hb_fsOsError ( void ); /* retrieve system dependant file system error */ extern HB_EXPORT BOOL hb_fsFile ( const char * pszFileName ); /* determine if a file exists */ extern HB_EXPORT BOOL hb_fsIsDirectory ( const char * pszFilename ); extern HB_EXPORT HB_FOFFSET hb_fsFSize ( const char * pszFileName, BOOL bUseDirEntry ); /* determine the size of a file */ @@ -177,7 +177,7 @@ extern HB_EXPORT HB_FHANDLE hb_fsExtOpen ( const char * pszFileName, const c USHORT uiFlags, const char * pPaths, PHB_ITEM pError ); /* open a file using default extension and a list of paths */ extern HB_EXPORT char * hb_fsExtName ( const char * pFilename, const char * pDefExt, USHORT uiExFlags, const char * pPaths ); /* convert file name for hb_fsExtOpen, caller must free the returned buffer */ -extern HB_EXPORT USHORT hb_fsIsDrv ( BYTE nDrive ); /* determine if a drive number is a valid drive */ +extern HB_EXPORT HB_ERRCODE hb_fsIsDrv ( BYTE nDrive ); /* determine if a drive number is a valid drive */ extern HB_EXPORT BOOL hb_fsIsDevice ( HB_FHANDLE hFileHandle ); /* determine if a file is attached to a device (console?) */ extern HB_EXPORT BOOL hb_fsLock ( HB_FHANDLE hFileHandle, ULONG ulStart, ULONG ulLength, USHORT uiMode ); /* request a lock on a portion of a file */ extern HB_EXPORT BOOL hb_fsLockLarge ( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, @@ -197,7 +197,7 @@ extern HB_EXPORT BOOL hb_fsGetFileTime ( const char * pszFileName, long * extern HB_EXPORT BOOL hb_fsSetFileTime ( const char * pszFileName, long lJulian, long lMillisec ); extern HB_EXPORT BOOL hb_fsGetAttr ( const char * pszFileName, ULONG * pulAttr ); extern HB_EXPORT BOOL hb_fsSetAttr ( const char * pszFileName, ULONG ulAttr ); -extern HB_EXPORT void hb_fsSetError ( USHORT uiError ); /* set the file system DOS error number */ +extern HB_EXPORT void hb_fsSetError ( HB_ERRCODE uiError ); /* set the file system DOS error number */ extern HB_EXPORT void hb_fsSetIOError ( BOOL fResult, USHORT uiOperation ); /* set the file system error number after IO operation */ extern HB_EXPORT BOOL hb_fsTruncAt ( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ); /* truncate file to given size */ extern HB_EXPORT USHORT hb_fsWrite ( HB_FHANDLE hFileHandle, const void * pBuff, USHORT ulCount ); /* write to an open file from a buffer (<=64K) */ @@ -205,8 +205,8 @@ extern HB_EXPORT ULONG hb_fsWriteLarge ( HB_FHANDLE hFileHandle, const voi extern HB_EXPORT ULONG hb_fsWriteAt ( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, HB_FOFFSET llOffset ); /* write to an open file at given offset from a buffer (>64K) */ extern HB_EXPORT HB_FHANDLE hb_fsPOpen ( const char * pFilename, const char * pMode ); extern HB_EXPORT HB_FHANDLE hb_fsGetOsHandle ( HB_FHANDLE hFileHandle ); -extern HB_EXPORT USHORT hb_fsGetFError ( void ); /* get FERROR() flag */ -extern HB_EXPORT void hb_fsSetFError ( USHORT uiError ); /* set FERROR() flag */ +extern HB_EXPORT HB_ERRCODE hb_fsGetFError ( void ); /* get FERROR() flag */ +extern HB_EXPORT void hb_fsSetFError ( HB_ERRCODE uiError ); /* set FERROR() flag */ extern HB_EXPORT BOOL hb_fsNameExists ( const char * pszFileName ); /* check if a name exists in the filesystem (wildcard chars not accepted). */ extern HB_EXPORT BOOL hb_fsFileExists ( const char * pszFileName ); /* check if a file exists (wildcard chars not accepted). */ extern HB_EXPORT BOOL hb_fsDirExists ( const char * pszDirName ); /* check if a directory exists (wildcard chars not accepted). */ diff --git a/harbour/include/hbstack.h b/harbour/include/hbstack.h index 715518df83..c7c9a0e727 100644 --- a/harbour/include/hbstack.h +++ b/harbour/include/hbstack.h @@ -90,11 +90,11 @@ HB_TSD, * PHB_TSD; typedef struct { - USHORT uiFError; - USHORT uiErrorLast; - USHORT uiOsErrorLast; - USHORT uiSocketError; - int iSocketOsError; + HB_ERRCODE uiFError; + HB_ERRCODE uiErrorLast; + HB_ERRCODE uiOsErrorLast; + HB_ERRCODE uiSocketError; + int iSocketOsError; } HB_IOERRORS, * PHB_IOERRORS; diff --git a/harbour/src/common/hbffind.c b/harbour/src/common/hbffind.c index b2293da944..cb61b9f2b0 100644 --- a/harbour/src/common/hbffind.c +++ b/harbour/src/common/hbffind.c @@ -726,7 +726,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) bFound = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #endif diff --git a/harbour/src/rtl/dirdrive.c b/harbour/src/rtl/dirdrive.c index 343054e3aa..5a98dad68d 100644 --- a/harbour/src/rtl/dirdrive.c +++ b/harbour/src/rtl/dirdrive.c @@ -60,9 +60,9 @@ HB_FUNC( DIRCHANGE ) { if( HB_ISCHAR( 1 ) ) - hb_retni( hb_fsChDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); + hb_retnl( hb_fsChDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); else - hb_retni( F_ERROR ); + hb_retnl( F_ERROR ); } /* NOTE: Clipper 5.3 NG incorrectly states that the name of this function is @@ -71,17 +71,17 @@ HB_FUNC( DIRCHANGE ) HB_FUNC( MAKEDIR ) { if( HB_ISCHAR( 1 ) ) - hb_retni( hb_fsMkDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); + hb_retnl( hb_fsMkDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); else - hb_retni( F_ERROR ); + hb_retnl( F_ERROR ); } HB_FUNC( DIRREMOVE ) { if( HB_ISCHAR( 1 ) ) - hb_retni( hb_fsRmDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); + hb_retnl( hb_fsRmDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); else - hb_retni( F_ERROR ); + hb_retnl( F_ERROR ); } /* NOTE: Clipper 5.3 undocumented */ diff --git a/harbour/src/rtl/errapi.c b/harbour/src/rtl/errapi.c index 0eaa3de96f..91471440d4 100644 --- a/harbour/src/rtl/errapi.c +++ b/harbour/src/rtl/errapi.c @@ -121,7 +121,7 @@ typedef struct HB_ERROR_INFO_PTR errorHandler; PHB_ITEM errorBlock; int iLaunchCount; - SHORT uiErrorDOS; /* The value of DOSERROR() */ + int uiErrorDOS; /* The value of DOSERROR() */ } HB_ERRDATA, * PHB_ERRDATA; static void hb_errorDataRelease( void * Cargo ) @@ -144,13 +144,13 @@ static BOOL hb_errGetNumCode( int * piValue, const char * szOperation ) { pItem = hb_errRT_BASE_Subst( EG_ARG, 0, NULL, szOperation, HB_ERR_ARGS_BASEPARAMS ); - if( !pItem ) + if( ! pItem ) { *piValue = 0; return FALSE; } - if( !HB_IS_NUMERIC( pItem ) ) + if( ! HB_IS_NUMERIC( pItem ) ) hb_errInternal( HB_EI_ERRRECFAILURE, NULL, NULL, NULL ); *piValue = hb_itemGetNI( pItem ); @@ -325,7 +325,7 @@ HB_FUNC_STATIC( _SUBSYSTEM ) HB_FUNC_STATIC( GENCODE ) { - hb_retni( hb_errGetGenCode( hb_stackSelfItem() ) ); + hb_retnl( hb_errGetGenCode( hb_stackSelfItem() ) ); } HB_FUNC_STATIC( _GENCODE ) @@ -334,18 +334,18 @@ HB_FUNC_STATIC( _GENCODE ) if( hb_errGetNumCode( &iValue, "GENCODE" ) ) { - hb_errPutGenCode( hb_stackSelfItem(), ( USHORT ) iValue ); + hb_errPutGenCode( hb_stackSelfItem(), ( HB_ERRCODE ) iValue ); hb_errPutDescription( hb_stackSelfItem(), hb_langDGetErrorDesc( iValue ) ); } - hb_retni( iValue ); + hb_retnl( iValue ); } HB_FUNC_STATIC( OSCODE ) { - hb_retni( hb_errGetOsCode( hb_stackSelfItem() ) ); + hb_retnl( hb_errGetOsCode( hb_stackSelfItem() ) ); } HB_FUNC_STATIC( _OSCODE ) @@ -353,15 +353,15 @@ HB_FUNC_STATIC( _OSCODE ) int iValue; if( hb_errGetNumCode( &iValue, "OSCODE" ) ) - hb_errPutOsCode( hb_stackSelfItem(), ( USHORT ) iValue ); + hb_errPutOsCode( hb_stackSelfItem(), ( HB_ERRCODE ) iValue ); - hb_retni( iValue ); + hb_retnl( iValue ); } HB_FUNC_STATIC( SUBCODE ) { - hb_retni( hb_errGetSubCode( hb_stackSelfItem() ) ); + hb_retnl( hb_errGetSubCode( hb_stackSelfItem() ) ); } HB_FUNC_STATIC( _SUBCODE ) @@ -369,9 +369,9 @@ HB_FUNC_STATIC( _SUBCODE ) int iValue; if( hb_errGetNumCode( &iValue, "SUBCODE" ) ) - hb_errPutSubCode( hb_stackSelfItem(), ( USHORT ) iValue ); + hb_errPutSubCode( hb_stackSelfItem(), ( HB_ERRCODE ) iValue ); - hb_retni( iValue ); + hb_retnl( iValue ); } @@ -472,7 +472,7 @@ PHB_ITEM hb_errorBlock( void ) { PHB_ERRDATA pErrData = ( PHB_ERRDATA ) hb_stackGetTSD( &s_errData ); - if( !pErrData->errorBlock ) + if( ! pErrData->errorBlock ) pErrData->errorBlock = hb_itemNew( NULL ); return pErrData->errorBlock; @@ -502,7 +502,7 @@ HB_FUNC( DOSERROR ) hb_retni( pErrData->uiErrorDOS ); if( HB_ISNUM( 1 ) ) - pErrData->uiErrorDOS = ( USHORT ) hb_parni( 1 ); + pErrData->uiErrorDOS = hb_parni( 1 ); } void hb_errInit( void ) @@ -530,7 +530,7 @@ PHB_ITEM hb_errNew( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_errNew()")); - if( !s_pError || !HB_IS_OBJECT( s_pError ) ) + if( ! s_pError || !HB_IS_OBJECT( s_pError ) ) hb_errInternal( HB_EI_ERRRECFAILURE, NULL, NULL, NULL ); return hb_arrayClone( s_pError ); @@ -549,7 +549,7 @@ USHORT hb_errLaunch( PHB_ITEM pError ) PHB_ITEM pResult; /* Check if we have a valid error handler */ - if( !pErrData->errorBlock || hb_itemType( pErrData->errorBlock ) != HB_IT_BLOCK ) + if( ! pErrData->errorBlock || hb_itemType( pErrData->errorBlock ) != HB_IT_BLOCK ) hb_errInternal( HB_EI_ERRNOBLOCK, NULL, NULL, NULL ); /* Check if the error launcher was called too many times recursively */ @@ -560,7 +560,7 @@ USHORT hb_errLaunch( PHB_ITEM pError ) pErrData->iLaunchCount++; /* set DOSERROR() to last OS error code */ - pErrData->uiErrorDOS = hb_errGetOsCode( pError ); + pErrData->uiErrorDOS = ( int ) hb_errGetOsCode( pError ); /* Add one try to the counter. */ if( uiFlags & EF_CANRETRY ) @@ -654,7 +654,7 @@ PHB_ITEM hb_errLaunchSubst( PHB_ITEM pError ) pErrData->iLaunchCount++; /* set DOSERROR() to last OS error code */ - pErrData->uiErrorDOS = hb_errGetOsCode( pError ); + pErrData->uiErrorDOS = ( int ) hb_errGetOsCode( pError ); /* Add one try to the counter. */ if( uiFlags & EF_CANRETRY ) @@ -768,18 +768,18 @@ PHB_ITEM hb_errPutFileName( PHB_ITEM pError, const char * szFileName ) return pError; } -USHORT hb_errGetGenCode( PHB_ITEM pError ) +HB_ERRCODE hb_errGetGenCode( PHB_ITEM pError ) { HB_TRACE(HB_TR_DEBUG, ("hb_errGetGenCode(%p)", pError)); - return ( USHORT ) hb_arrayGetNI( pError, HB_TERROR_GENCODE ); + return ( HB_ERRCODE ) hb_arrayGetNL( pError, HB_TERROR_GENCODE ); } -PHB_ITEM hb_errPutGenCode( PHB_ITEM pError, USHORT uiGenCode ) +PHB_ITEM hb_errPutGenCode( PHB_ITEM pError, HB_ERRCODE uiGenCode ) { HB_TRACE(HB_TR_DEBUG, ("hb_errPutGenCode(%p, %hu)", pError, uiGenCode)); - hb_arraySetNI( pError, HB_TERROR_GENCODE, uiGenCode ); + hb_arraySetNL( pError, HB_TERROR_GENCODE, uiGenCode ); return pError; } @@ -807,18 +807,18 @@ PHB_ITEM hb_errPutOperation( PHB_ITEM pError, const char * szOperation ) return pError; } -USHORT hb_errGetOsCode( PHB_ITEM pError ) +HB_ERRCODE hb_errGetOsCode( PHB_ITEM pError ) { HB_TRACE(HB_TR_DEBUG, ("hb_errGetOsCode(%p)", pError)); - return ( USHORT ) hb_arrayGetNI( pError, HB_TERROR_OSCODE ); + return ( HB_ERRCODE ) hb_arrayGetNL( pError, HB_TERROR_OSCODE ); } -PHB_ITEM hb_errPutOsCode( PHB_ITEM pError, USHORT uiOsCode ) +PHB_ITEM hb_errPutOsCode( PHB_ITEM pError, HB_ERRCODE uiOsCode ) { HB_TRACE(HB_TR_DEBUG, ("hb_errPutOsCode(%p, %hu)", pError, uiOsCode)); - hb_arraySetNI( pError, HB_TERROR_OSCODE, uiOsCode ); + hb_arraySetNL( pError, HB_TERROR_OSCODE, uiOsCode ); return pError; } @@ -839,18 +839,18 @@ PHB_ITEM hb_errPutSeverity( PHB_ITEM pError, USHORT uiSeverity ) return pError; } -USHORT hb_errGetSubCode( PHB_ITEM pError ) +HB_ERRCODE hb_errGetSubCode( PHB_ITEM pError ) { HB_TRACE(HB_TR_DEBUG, ("hb_errGetSubCode(%p)", pError)); - return ( USHORT ) hb_arrayGetNI( pError, HB_TERROR_SUBCODE ); + return ( HB_ERRCODE ) hb_arrayGetNL( pError, HB_TERROR_SUBCODE ); } -PHB_ITEM hb_errPutSubCode( PHB_ITEM pError, USHORT uiSubCode ) +PHB_ITEM hb_errPutSubCode( PHB_ITEM pError, HB_ERRCODE uiSubCode ) { HB_TRACE(HB_TR_DEBUG, ("hb_errPutSubCode(%p, %hu)", pError, uiSubCode)); - hb_arraySetNI( pError, HB_TERROR_SUBCODE, uiSubCode ); + hb_arraySetNL( pError, HB_TERROR_SUBCODE, uiSubCode ); return pError; } @@ -935,19 +935,19 @@ PHB_ITEM hb_errPutArgs( PHB_ITEM pError, ULONG ulArgCount, ... ) PHB_ITEM hb_errRT_New( USHORT uiSeverity, const char * szSubSystem, - ULONG ulGenCode, - ULONG ulSubCode, + HB_ERRCODE ulGenCode, + HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, - USHORT uiOsCode, + HB_ERRCODE uiOsCode, USHORT uiFlags ) { PHB_ITEM pError = hb_errNew(); hb_errPutSeverity( pError, uiSeverity ); hb_errPutSubSystem( pError, szSubSystem ? szSubSystem : HB_ERR_SS_BASE ); - hb_errPutGenCode( pError, ( USHORT ) ulGenCode ); - hb_errPutSubCode( pError, ( USHORT ) ulSubCode ); + hb_errPutGenCode( pError, ulGenCode ); + hb_errPutSubCode( pError, ulSubCode ); hb_errPutDescription( pError, szDescription ? szDescription : hb_langDGetItem( HB_LANG_ITEM_BASE_ERRDESC + ulGenCode ) ); hb_errPutOperation( pError, szOperation ); hb_errPutOsCode( pError, uiOsCode ); @@ -959,19 +959,19 @@ PHB_ITEM hb_errRT_New( PHB_ITEM hb_errRT_New_Subst( USHORT uiSeverity, const char * szSubSystem, - ULONG ulGenCode, - ULONG ulSubCode, + HB_ERRCODE ulGenCode, + HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, - USHORT uiOsCode, + HB_ERRCODE uiOsCode, USHORT uiFlags ) { PHB_ITEM pError = hb_errNew(); hb_errPutSeverity( pError, uiSeverity ); hb_errPutSubSystem( pError, szSubSystem ? szSubSystem : HB_ERR_SS_BASE ); - hb_errPutGenCode( pError, ( USHORT ) ulGenCode ); - hb_errPutSubCode( pError, ( USHORT ) ulSubCode ); + hb_errPutGenCode( pError, ulGenCode ); + hb_errPutSubCode( pError, ulSubCode ); hb_errPutDescription( pError, szDescription ? szDescription : hb_langDGetItem( HB_LANG_ITEM_BASE_ERRDESC + ulGenCode ) ); hb_errPutOperation( pError, szOperation ); hb_errPutOsCode( pError, uiOsCode ); @@ -1008,10 +1008,10 @@ PHB_ITEM hb_errRT_SubstParams( const char * szSubSystem, ULONG ulGenCode, ULONG } PHB_ITEM hb_errRT_FileError( PHB_ITEM pError, const char * szSubSystem, - ULONG ulGenCode, ULONG ulSubCode, + HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szFileName ) { - if( !pError ) + if( ! pError ) { pError = hb_errNew(); hb_errPutSeverity( pError, ES_ERROR ); @@ -1019,9 +1019,9 @@ PHB_ITEM hb_errRT_FileError( PHB_ITEM pError, const char * szSubSystem, hb_errPutFlags( pError, EF_CANRETRY | EF_CANDEFAULT ); hb_errPutFileName( pError, szFileName ); } - hb_errPutGenCode( pError, ( USHORT ) ulGenCode ); + hb_errPutGenCode( pError, ulGenCode ); hb_errPutDescription( pError, hb_langDGetErrorDesc( ulGenCode ) ); - hb_errPutSubCode( pError, ( USHORT ) ulSubCode ); + hb_errPutSubCode( pError, ulSubCode ); hb_errPutOsCode( pError, hb_fsError() ); return pError; @@ -1029,25 +1029,25 @@ PHB_ITEM hb_errRT_FileError( PHB_ITEM pError, const char * szSubSystem, HB_FUNC( __ERRRT_BASE ) { - hb_errRT_BASE( ( ULONG ) hb_parnl( 1 ), - ( ULONG ) hb_parnl( 2 ), + hb_errRT_BASE( ( HB_ERRCODE ) hb_parnl( 1 ), + ( HB_ERRCODE ) hb_parnl( 2 ), hb_parc( 3 ), hb_parc( 4 ), - ( USHORT ) ( hb_pcount() > 5 && hb_parni( 5 ) > 0 ? 1 : 0 ), + ( hb_pcount() > 5 && hb_parnl( 5 ) > 0 ? 1 : 0 ), hb_param( 6, HB_IT_ANY ) ); } HB_FUNC( __ERRRT_SBASE ) { - hb_errRT_BASE_SubstR( ( ULONG ) hb_parnl( 1 ), - ( ULONG ) hb_parnl( 2 ), + hb_errRT_BASE_SubstR( ( HB_ERRCODE ) hb_parnl( 1 ), + ( HB_ERRCODE ) hb_parnl( 2 ), hb_parc( 3 ), hb_parc( 4 ), - ( USHORT ) ( hb_pcount() > 5 && hb_parni( 5 ) > 0 ? 1 : 0 ), + ( hb_pcount() > 5 && hb_parnl( 5 ) > 0 ? 1 : 0 ), hb_param( 6, HB_IT_ANY ) ); } -USHORT hb_errRT_BASE( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ) +USHORT hb_errRT_BASE( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, ULONG ulArgCount, ... ) { USHORT uiAction; PHB_ITEM pError; @@ -1108,7 +1108,7 @@ USHORT hb_errRT_BASE( ULONG ulGenCode, ULONG ulSubCode, const char * szDescripti return uiAction; } -USHORT hb_errRT_BASE_Ext1( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiOsCode, USHORT uiFlags, ULONG ulArgCount, ... ) +USHORT hb_errRT_BASE_Ext1( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, HB_ERRCODE uiOsCode, USHORT uiFlags, ULONG ulArgCount, ... ) { USHORT uiAction; PHB_ITEM pError; @@ -1275,7 +1275,7 @@ void hb_errRT_BASE_SubstR( ULONG ulGenCode, ULONG ulSubCode, const char * szDesc hb_errRelease( pError ); } -USHORT hb_errRT_TERM( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiOSCode, USHORT uiFlags ) +USHORT hb_errRT_TERM( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, HB_ERRCODE uiOSCode, USHORT uiFlags ) { USHORT uiAction; PHB_ITEM pError = @@ -1288,7 +1288,7 @@ USHORT hb_errRT_TERM( ULONG ulGenCode, ULONG ulSubCode, const char * szDescripti return uiAction; } -USHORT hb_errRT_DBCMD( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation ) +USHORT hb_errRT_DBCMD( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation ) { USHORT uiAction; PHB_ITEM pError = @@ -1301,7 +1301,7 @@ USHORT hb_errRT_DBCMD( ULONG ulGenCode, ULONG ulSubCode, const char * szDescript return uiAction; } -USHORT hb_errRT_DBCMD_Ext( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiFlags ) +USHORT hb_errRT_DBCMD_Ext( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, USHORT uiFlags ) { USHORT uiAction; PHB_ITEM pError; diff --git a/harbour/src/rtl/filebuf.c b/harbour/src/rtl/filebuf.c index b5779e1d5e..73caeea364 100644 --- a/harbour/src/rtl/filebuf.c +++ b/harbour/src/rtl/filebuf.c @@ -368,7 +368,7 @@ static PHB_FILE s_fileExtOpen( const char * pFilename, const char * pDefExt, if( !fResult ) { hb_errPutOsCode( pError, hb_fsError() ); - hb_errPutGenCode( pError, ( USHORT ) ( ( uiExFlags & FXO_TRUNCATE ) ? EG_CREATE : EG_OPEN ) ); + hb_errPutGenCode( pError, ( HB_ERRCODE ) ( ( uiExFlags & FXO_TRUNCATE ) ? EG_CREATE : EG_OPEN ) ); } } } diff --git a/harbour/src/rtl/filesys.c b/harbour/src/rtl/filesys.c index 603f78b9eb..5603291ae5 100644 --- a/harbour/src/rtl/filesys.c +++ b/harbour/src/rtl/filesys.c @@ -636,7 +636,7 @@ HB_FHANDLE hb_fsPOpen( const char * pFilename, const char * pMode ) HB_SYMBOL_UNUSED( pFilename ); HB_SYMBOL_UNUSED( pMode ); - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -695,7 +695,7 @@ HB_FHANDLE hb_fsOpen( const char * pFilename, USHORT uiFlags ) #else hFileHandle = FS_ERROR; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -751,7 +751,7 @@ HB_FHANDLE hb_fsCreate( const char * pFilename, ULONG ulAttr ) #else hFileHandle = FS_ERROR; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -811,7 +811,7 @@ HB_FHANDLE hb_fsCreateEx( const char * pFilename, ULONG ulAttr, USHORT uiFlags ) #else hFileHandle = FS_ERROR; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -837,7 +837,7 @@ void hb_fsClose( HB_FHANDLE hFileHandle ) #else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif } @@ -908,7 +908,7 @@ BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) if( uiDevMode == FD_TEXT ) { - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); return FALSE; } @@ -917,7 +917,7 @@ BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) #else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); return FALSE; #endif @@ -1266,7 +1266,7 @@ BOOL hb_fsSetFileTime( const char * pszFileName, long lJulian, long lMillisec ) int TODO; /* To force warning */ fResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #endif @@ -1370,7 +1370,7 @@ BOOL hb_fsSetAttr( const char * pszFileName, ULONG ulAttr ) int TODO; /* To force warning */ fResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #endif @@ -1413,7 +1413,7 @@ USHORT hb_fsRead( HB_FHANDLE hFileHandle, void * pBuff, USHORT uiCount ) #else uiRead = 0; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -1473,7 +1473,7 @@ USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const void * pBuff, USHORT uiCount ) #else uiWritten = 0; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -1553,7 +1553,7 @@ ULONG hb_fsReadLarge( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount ) #else ulRead = 0; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -1655,7 +1655,7 @@ ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount #else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -1749,7 +1749,7 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount, HB_FOFFS #else ulRead = 0; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -1843,7 +1843,7 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, H #else ulWritten = 0; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -1888,7 +1888,7 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) #else fResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -1978,7 +1978,7 @@ void hb_fsCommit( HB_FHANDLE hFileHandle ) #else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif } @@ -2180,7 +2180,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, #else bResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2326,7 +2326,7 @@ ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) { ret = DosSetFilePtr( hFileHandle, lOffset, Flags, &ulPos ); /* TODO: what we should do with this error code? Is it DOS compatible? */ - hb_fsSetError( ( USHORT ) ret ); + hb_fsSetError( ( HB_ERRCODE ) ret ); } if( ret != 0 ) { @@ -2492,7 +2492,7 @@ BOOL hb_fsDelete( const char * pFilename ) #else bResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2537,7 +2537,7 @@ BOOL hb_fsRename( const char * pOldName, const char * pNewName ) #else bResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2589,7 +2589,7 @@ BOOL hb_fsMkDir( const char * pDirname ) #else bResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2631,7 +2631,7 @@ BOOL hb_fsChDir( const char * pDirname ) #else bResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2673,7 +2673,7 @@ BOOL hb_fsRmDir( const char * pDirname ) #else bResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2701,9 +2701,10 @@ const char * hb_fsCurDir( USHORT uiDrive ) /* NOTE: Thread safe version of hb_fsCurDir() */ /* NOTE: 0 = current drive, 1 = A, 2 = B, 3 = C, etc. */ -USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) +HB_ERRCODE hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) { - USHORT uiCurDrv = uiDrive, usError; + USHORT uiCurDrv = uiDrive; + HB_ERRCODE usError; char * pszStart; ULONG ulLen; BOOL fResult; @@ -2761,7 +2762,7 @@ USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) #else fResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2832,9 +2833,9 @@ USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) /* NOTE: 0=A:, 1=B:, 2=C:, 3=D:, ... */ -USHORT hb_fsChDrv( BYTE nDrive ) +HB_ERRCODE hb_fsChDrv( BYTE nDrive ) { - USHORT uiResult; + HB_ERRCODE uiResult; HB_TRACE(HB_TR_DEBUG, ("hb_fsChDrv(%d)", ( int ) nDrive)); @@ -2858,20 +2859,20 @@ USHORT hb_fsChDrv( BYTE nDrive ) { HB_FS_SETDRIVE( uiSave ); - uiResult = ( USHORT ) FS_ERROR; - hb_fsSetError( ( USHORT ) FS_ERROR ); + uiResult = ( HB_ERRCODE ) FS_ERROR; + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } hb_vmLock(); } #else HB_SYMBOL_UNUSED( nDrive ); - uiResult = ( USHORT ) FS_ERROR; - hb_fsSetError( ( USHORT ) FS_ERROR ); + uiResult = ( HB_ERRCODE ) FS_ERROR; + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif - return uiResult; + return HB_ERRCODE; } /* NOTE: 0=A:, 1=B:, 2=C:, 3=D:, ... */ @@ -2892,7 +2893,7 @@ BYTE hb_fsCurDrv( void ) #else uiResult = 0; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); #endif @@ -2901,16 +2902,16 @@ BYTE hb_fsCurDrv( void ) /* NOTE: 0=A:, 1=B:, 2=C:, 3=D:, ... */ -USHORT hb_fsIsDrv( BYTE nDrive ) +HB_ERRCODE hb_fsIsDrv( BYTE nDrive ) { - USHORT uiResult; + HB_ERRCODE uiResult; HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDrv(%d)", ( int ) nDrive)); #if defined( HB_OS_WIN ) && !defined( HB_OS_WIN_CE ) { hb_vmUnlock(); - uiResult = ( ( GetLogicalDrives() >> nDrive ) & 1 ) ? 0 : ( USHORT ) F_ERROR; + uiResult = ( ( GetLogicalDrives() >> nDrive ) & 1 ) ? 0 : ( HB_ERRCODE ) F_ERROR; hb_vmLock(); hb_fsSetError( 0 ); } @@ -2925,7 +2926,7 @@ USHORT hb_fsIsDrv( BYTE nDrive ) HB_FS_GETDRIVE( uiSave ); HB_FS_SETDRIVE( nDrive ); HB_FS_GETDRIVE( uiNewDrive ); - uiResult = ( ( UINT ) nDrive == uiNewDrive ) ? 0 : ( USHORT ) FS_ERROR; + uiResult = ( ( UINT ) nDrive == uiNewDrive ) ? 0 : ( HB_ERRCODE ) FS_ERROR; HB_FS_SETDRIVE( uiSave ); hb_fsSetError( 0 ); @@ -2934,7 +2935,7 @@ USHORT hb_fsIsDrv( BYTE nDrive ) #else HB_SYMBOL_UNUSED( nDrive ); - uiResult = ( USHORT ) FS_ERROR; + uiResult = ( HB_ERRCODE ) FS_ERROR; hb_fsSetError( 0 ); #endif @@ -2969,7 +2970,7 @@ BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle ) #else bResult = FALSE; - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); HB_SYMBOL_UNUSED( hFileHandle ); #endif @@ -3161,7 +3162,7 @@ HB_FHANDLE hb_fsExtOpen( const char * pFilename, const char * pDefExt, if( hFile == FS_ERROR ) { hb_errPutOsCode( pError, hb_fsError() ); - hb_errPutGenCode( pError, ( USHORT ) ( ( uiExFlags & FXO_TRUNCATE ) ? EG_CREATE : EG_OPEN ) ); + hb_errPutGenCode( pError, ( HB_ERRCODE ) ( ( uiExFlags & FXO_TRUNCATE ) ? EG_CREATE : EG_OPEN ) ); } } diff --git a/harbour/src/rtl/fscopy.c b/harbour/src/rtl/fscopy.c index 3c7fc0fc4a..5615188f4e 100644 --- a/harbour/src/rtl/fscopy.c +++ b/harbour/src/rtl/fscopy.c @@ -108,7 +108,7 @@ BOOL hb_fsCopy( const char * pszSource, const char * pszDest ) HB_FUNC( HB_FCOPY ) { - USHORT uiError = 2; + HB_ERRCODE uiError = 2; const char * pszSource = hb_parc( 1 ), * pszDest = hb_parc( 2 ); if( pszSource && pszDest ) diff --git a/harbour/src/rtl/fserr.c b/harbour/src/rtl/fserr.c index a42becb049..26667a6feb 100644 --- a/harbour/src/rtl/fserr.c +++ b/harbour/src/rtl/fserr.c @@ -177,7 +177,7 @@ static int hb_WinToDosError( ULONG ulError ) #endif /* return FERROR() code */ -USHORT hb_fsGetFError( void ) +HB_ERRCODE hb_fsGetFError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsGetFError()")); @@ -185,7 +185,7 @@ USHORT hb_fsGetFError( void ) } /* return DOS error code of last operation */ -USHORT hb_fsError( void ) +HB_ERRCODE hb_fsError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsError()")); @@ -193,7 +193,7 @@ USHORT hb_fsError( void ) } /* return real error code of last operation */ -USHORT hb_fsOsError( void ) +HB_ERRCODE hb_fsOsError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsOsError()")); @@ -201,7 +201,7 @@ USHORT hb_fsOsError( void ) } /* set FERROR() code */ -void hb_fsSetFError( USHORT uiError ) +void hb_fsSetFError( HB_ERRCODE uiError ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsSetFError(%hu)", uiError)); @@ -209,7 +209,7 @@ void hb_fsSetFError( USHORT uiError ) } /* set DOS error code for last operation */ -void hb_fsSetError( USHORT uiError ) +void hb_fsSetError( HB_ERRCODE uiError ) { PHB_IOERRORS pIOErrors; @@ -223,7 +223,7 @@ void hb_fsSetError( USHORT uiError ) /* set error code for last operation */ void hb_fsSetIOError( BOOL fResult, USHORT uiOperation ) { - USHORT uiOsErrorLast, uiErrorLast; + HB_ERRCODE uiOsErrorLast, uiErrorLast; PHB_IOERRORS pIOErrors; HB_TRACE(HB_TR_DEBUG, ("hb_fsSetIOError(%d,%hu)", fResult, uiOperation)); @@ -238,8 +238,8 @@ void hb_fsSetIOError( BOOL fResult, USHORT uiOperation ) else { #if defined( HB_IO_WIN ) || defined( HB_OS_WIN ) - uiOsErrorLast = ( USHORT ) GetLastError(); - uiErrorLast = ( USHORT ) hb_WinToDosError( uiOsErrorLast ); + uiOsErrorLast = ( HB_ERRCODE ) GetLastError(); + uiErrorLast = ( HB_ERRCODE ) hb_WinToDosError( uiOsErrorLast ); #elif defined( _MSC_VER ) || defined( __DMC__ ) #if defined( __XCC__ ) extern unsigned long _doserrno; diff --git a/harbour/src/rtl/hbfeof.c b/harbour/src/rtl/hbfeof.c index 11ff54aa34..6e8a0906ec 100644 --- a/harbour/src/rtl/hbfeof.c +++ b/harbour/src/rtl/hbfeof.c @@ -55,7 +55,7 @@ HB_FUNC( HB_FEOF ) { - USHORT uiError = 6; + HB_ERRCODE uiError = 6; if( HB_ISNUM( 1 ) ) { @@ -64,5 +64,6 @@ HB_FUNC( HB_FEOF ) } else hb_retl( TRUE ); + hb_fsSetFError( uiError ); } diff --git a/harbour/src/rtl/hbproces.c b/harbour/src/rtl/hbproces.c index 8236a22ac0..cd558abe40 100644 --- a/harbour/src/rtl/hbproces.c +++ b/harbour/src/rtl/hbproces.c @@ -373,7 +373,7 @@ static int hb_fsProcessExec( const char *pszFilename, HB_SYMBOL_UNUSED( hStdout ); HB_SYMBOL_UNUSED( hStderr ); - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #endif @@ -782,7 +782,7 @@ HB_FHANDLE hb_fsProcessOpen( const char *pszFilename, HB_SYMBOL_UNUSED( fDetach ); HB_SYMBOL_UNUSED( pulPID ); - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #endif @@ -819,7 +819,7 @@ int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait ) hb_vmLock(); } else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #elif defined( HB_OS_UNIX ) || ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) ) { @@ -844,7 +844,7 @@ int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait ) hb_vmLock(); } else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #elif defined( HB_OS_OS2 ) || defined( HB_OS_WIN ) { @@ -866,7 +866,7 @@ int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait ) hb_vmLock(); } else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #else { @@ -874,7 +874,7 @@ int hb_fsProcessValue( HB_FHANDLE hProcess, BOOL fWait ) HB_SYMBOL_UNUSED( hProcess ); HB_SYMBOL_UNUSED( fWait ); - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #endif return iRetStatus; @@ -900,7 +900,7 @@ BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle ) hb_fsSetIOError( fResult, 0 ); } else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #elif defined( HB_OS_UNIX ) || ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) ) { @@ -912,7 +912,7 @@ BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle ) hb_fsSetIOError( fResult, 0 ); } else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #elif defined( HB_OS_WIN ) { @@ -926,7 +926,7 @@ BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle ) CloseHandle( hProc ); } else - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #else { @@ -934,7 +934,7 @@ BOOL hb_fsProcessClose( HB_FHANDLE hProcess, BOOL fGentle ) HB_SYMBOL_UNUSED( hProcess ); HB_SYMBOL_UNUSED( fGentle ); - hb_fsSetError( ( USHORT ) FS_ERROR ); + hb_fsSetError( ( HB_ERRCODE ) FS_ERROR ); } #endif return fResult; diff --git a/harbour/src/rtl/hbsocket.c b/harbour/src/rtl/hbsocket.c index 7031983dba..8200142ccb 100644 --- a/harbour/src/rtl/hbsocket.c +++ b/harbour/src/rtl/hbsocket.c @@ -335,7 +335,7 @@ const char * hb_socketErrorStr( int iError ) static void hb_socketSetRawError( int err ) { PHB_IOERRORS pError = hb_stackIOErrors(); - pError->uiSocketError = ( USHORT ) err; + pError->uiSocketError = ( HB_ERRCODE ) err; pError->iSocketOsError = 0; } @@ -778,7 +778,7 @@ void hb_socketCleanup( void ) static void hb_socketSetOsError( int err ) { PHB_IOERRORS pError = hb_stackIOErrors(); - USHORT uiErr; + HB_ERRCODE uiErr; #if defined( HB_OS_WIN ) switch( err ) diff --git a/harbour/src/rtl/philes.c b/harbour/src/rtl/philes.c index 02e37ccdb2..fcb0c661b9 100644 --- a/harbour/src/rtl/philes.c +++ b/harbour/src/rtl/philes.c @@ -112,7 +112,7 @@ HB_FUNC( HB_FCREATE ) HB_FUNC( FREAD ) { PHB_ITEM pBuffer = hb_param( 2, HB_IT_STRING ); - USHORT uiError = 0; + HB_ERRCODE uiError = 0; ULONG ulRead = 0, ulSize; char * buffer; @@ -141,7 +141,7 @@ HB_FUNC( FREAD ) HB_FUNC( FWRITE ) { - USHORT uiError = 0; + HB_ERRCODE uiError = 0; if( HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) ) { @@ -169,7 +169,7 @@ HB_FUNC( FERROR ) HB_FUNC( FCLOSE ) { - USHORT uiError = 0; + HB_ERRCODE uiError = 0; if( HB_ISNUM( 1 ) ) { hb_fsClose( hb_numToHandle( hb_parnint( 1 ) ) ); @@ -183,7 +183,7 @@ HB_FUNC( FCLOSE ) HB_FUNC( FERASE ) { - USHORT uiError = 3; + HB_ERRCODE uiError = 3; const char * szFile = hb_parc( 1 ); if( szFile ) @@ -198,7 +198,7 @@ HB_FUNC( FERASE ) HB_FUNC( FRENAME ) { - USHORT uiError = 2; + HB_ERRCODE uiError = 2; const char * szFileOld = hb_parc( 1 ), * szFileNew = hb_parc( 2 ); @@ -214,7 +214,7 @@ HB_FUNC( FRENAME ) HB_FUNC( FSEEK ) { - USHORT uiError = 0; + HB_ERRCODE uiError = 0; if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { @@ -231,7 +231,7 @@ HB_FUNC( FSEEK ) HB_FUNC( FREADSTR ) { - USHORT uiError = 0; + HB_ERRCODE uiError = 0; if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { @@ -313,7 +313,7 @@ HB_FUNC( HB_DIRBASE ) HB_FUNC( HB_FCOMMIT ) { - USHORT uiError = 6; + HB_ERRCODE uiError = 6; if( HB_ISNUM( 1 ) ) { @@ -326,7 +326,7 @@ HB_FUNC( HB_FCOMMIT ) HB_FUNC( HB_FLOCK ) { - USHORT uiError = 0; + HB_ERRCODE uiError = 0; BOOL fResult = FALSE; if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) @@ -343,7 +343,7 @@ HB_FUNC( HB_FLOCK ) HB_FUNC( HB_FUNLOCK ) { - USHORT uiError = 0; + HB_ERRCODE uiError = 0; BOOL fResult = FALSE; if( HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) @@ -419,7 +419,7 @@ HB_FUNC( HB_FGETDATETIME ) HB_FUNC( HB_OSERROR ) { - hb_retni( hb_fsOsError() ); + hb_retnl( hb_fsOsError() ); } HB_FUNC( HB_OSPATHSEPARATOR )