From 76b6ca9f63d13f4ef8a4159d3b4e154c784d8f2d Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Fri, 10 Sep 1999 19:10:56 +0000 Subject: [PATCH] See ChangeLog entry 19990910-14:55 EDT David G. Holm --- harbour/ChangeLog | 8 ++++++ harbour/source/rdd/dbcmd.c | 2 +- harbour/source/rdd/dbf1.c | 30 +++++++++---------- harbour/source/rtl/copyfile.c | 8 +++--- harbour/source/rtl/filesys.c | 54 +++++++++++++++++------------------ harbour/source/rtl/set.c | 18 ++++++------ 6 files changed, 64 insertions(+), 56 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c3bdf70356..acb5109ab8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +19990910-14:55 EDT David G. Holm + * source/rdd/dbcmd.c + * source/rdd/dbf1.c + * source/rtl/copyfile.c + * source/rtl/filesys.c + * source/rtl/set.c + * Changed F_ERROR back to FS_ERROR. + 19990910-14:40 EDT David G. Holm * source/compiler/harbour.y ! Changed DWORD return type for PackDateTime() to ULONG. diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index 80dd50ad77..6f0075175d 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -307,7 +307,7 @@ static ERRCODE NewArea( AREAP pArea ) { pArea->lpFileInfo = ( LPFILEINFO ) hb_xgrab( sizeof( FILEINFO ) ); memset( pArea->lpFileInfo, 0, sizeof( FILEINFO ) ); - pArea->lpFileInfo->hFile = F_ERROR; + pArea->lpFileInfo->hFile = FS_ERROR; pArea->lpExtendInfo = ( LPDBEXTENDINFO ) hb_xgrab( sizeof( DBEXTENDINFO ) ); memset( pArea->lpExtendInfo, 0, sizeof( DBEXTENDINFO ) ); return SUCCESS; diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 9b03fd1cee..0c524412e0 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -669,12 +669,12 @@ static ERRCODE Append( AREAP pArea, BOOL bUnLockAll ) static ERRCODE Close( AREAP pArea ) { - if( pArea->lpFileInfo->hFile != F_ERROR ) + if( pArea->lpFileInfo->hFile != FS_ERROR ) { SELF_RAWLOCK( pArea, FILE_UNLOCK, 0 ); SELF_FLUSH( pArea ); hb_fsClose( pArea->lpFileInfo->hFile ); - pArea->lpFileInfo->hFile = F_ERROR; + pArea->lpFileInfo->hFile = FS_ERROR; } if( pArea->lpExtendInfo->fHasMemo ) SELF_CLOSEMEMFILE( pArea ); @@ -684,11 +684,11 @@ static ERRCODE Close( AREAP pArea ) static ERRCODE CloseMemFile( AREAP pArea ) { - if( pArea->lpFileInfo->pNext->hFile != F_ERROR ) + if( pArea->lpFileInfo->pNext->hFile != FS_ERROR ) { SELF_FLUSH( pArea ); hb_fsClose( pArea->lpFileInfo->pNext->hFile ); - pArea->lpFileInfo->pNext->hFile = F_ERROR; + pArea->lpFileInfo->pNext->hFile = FS_ERROR; } return SUCCESS; @@ -697,18 +697,18 @@ static ERRCODE CloseMemFile( AREAP pArea ) static ERRCODE Create( AREAP pArea, LPDBOPENINFO pCreateInfo ) { pArea->lpFileInfo->hFile = hb_fsCreate( pCreateInfo->abName, FC_NORMAL ); - if( pArea->lpFileInfo->hFile == F_ERROR ) + if( pArea->lpFileInfo->hFile == FS_ERROR ) return FAILURE; if( SELF_WRITEDBHEADER( pArea ) == FAILURE ) { hb_fsClose( pArea->lpFileInfo->hFile ); - pArea->lpFileInfo->hFile = F_ERROR; + pArea->lpFileInfo->hFile = FS_ERROR; return FAILURE; } hb_fsClose( pArea->lpFileInfo->hFile ); - pArea->lpFileInfo->hFile = F_ERROR; + pArea->lpFileInfo->hFile = FS_ERROR; return SUCCESS; } @@ -720,10 +720,10 @@ static ERRCODE CreateMemFile( AREAP pArea, LPDBOPENINFO pCreateInfo ) lpMemInfo = ( LPFILEINFO ) hb_xgrab( sizeof( FILEINFO ) ); memset( lpMemInfo, 0, sizeof( FILEINFO ) ); - lpMemInfo->hFile = F_ERROR; + lpMemInfo->hFile = FS_ERROR; pArea->lpFileInfo->pNext = lpMemInfo; lpMemInfo->hFile = hb_fsCreate( pCreateInfo->abName, FC_NORMAL ); - if( lpMemInfo->hFile == F_ERROR ) + if( lpMemInfo->hFile == FS_ERROR ) return FAILURE; pMemoHeader = ( LPMEMOHEADER ) hb_xgrab( MEMO_BLOCK + 1 ); @@ -733,7 +733,7 @@ static ERRCODE CreateMemFile( AREAP pArea, LPDBOPENINFO pCreateInfo ) MEMO_BLOCK + 1 ) != MEMO_BLOCK + 1 ); hb_xfree( pMemoHeader ); hb_fsClose( lpMemInfo->hFile ); - lpMemInfo->hFile = F_ERROR; + lpMemInfo->hFile = FS_ERROR; if( bError ) return FAILURE; else @@ -776,9 +776,9 @@ static ERRCODE DeleteRec( AREAP pArea ) static ERRCODE Flush( AREAP pArea ) { - if( pArea->lpFileInfo->hFile != F_ERROR ) + if( pArea->lpFileInfo->hFile != FS_ERROR ) hb_fsCommit( pArea->lpFileInfo->hFile ); - if( pArea->lpExtendInfo->fHasMemo && pArea->lpFileInfo->pNext->hFile != F_ERROR ) + if( pArea->lpExtendInfo->fHasMemo && pArea->lpFileInfo->pNext->hFile != FS_ERROR ) hb_fsCommit( pArea->lpFileInfo->pNext->hFile ); return FAILURE; } @@ -1008,7 +1008,7 @@ static ERRCODE Open( AREAP pArea, LPDBOPENINFO pOpenInfo ) uiFlags |= pOpenInfo->fShared ? FO_DENYNONE : FO_EXCLUSIVE; pArea->lpFileInfo->hFile = hb_fsOpen( pOpenInfo->abName, uiFlags ); - if( pArea->lpFileInfo->hFile == F_ERROR ) + if( pArea->lpFileInfo->hFile == FS_ERROR ) { SELF_CLOSE( pArea ); return FAILURE; @@ -1032,14 +1032,14 @@ static ERRCODE OpenMemFile( AREAP pArea, LPDBOPENINFO pOpenInfo ) lpMemInfo = ( LPFILEINFO ) hb_xgrab( sizeof( FILEINFO ) ); memset( lpMemInfo, 0, sizeof( FILEINFO ) ); - lpMemInfo->hFile = F_ERROR; + lpMemInfo->hFile = FS_ERROR; pArea->lpFileInfo->pNext = lpMemInfo; uiFlags = pOpenInfo->fReadonly ? FO_READ : FO_READWRITE; uiFlags |= pOpenInfo->fShared ? FO_DENYNONE : FO_EXCLUSIVE; lpMemInfo->hFile = hb_fsOpen( pOpenInfo->abName, uiFlags ); - if( lpMemInfo->hFile == F_ERROR ) + if( lpMemInfo->hFile == FS_ERROR ) return FAILURE; pMemoHeader = ( LPMEMOHEADER ) hb_xgrab( MEMO_BLOCK + 1 ); diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c index da6cf4dda3..f3bb95f372 100644 --- a/harbour/source/rtl/copyfile.c +++ b/harbour/source/rtl/copyfile.c @@ -42,7 +42,7 @@ static BOOL hb_fsCopy( char * szSource, char * szDest ) FHANDLE fhndSource; FHANDLE fhndDest; - while( ( fhndSource = hb_fsOpen( ( BYTE * ) szSource, FO_READ ) ) == F_ERROR ) + while( ( fhndSource = hb_fsOpen( ( BYTE * ) szSource, FO_READ ) ) == FS_ERROR ) { WORD wResult = hb_errRT_BASE_Ext1( EG_OPEN, 2012, NULL, szSource, hb_fsError(), EF_CANDEFAULT | EF_CANRETRY ); @@ -50,9 +50,9 @@ static BOOL hb_fsCopy( char * szSource, char * szDest ) break; } - if( fhndSource != F_ERROR ) + if( fhndSource != FS_ERROR ) { - while( ( fhndDest = hb_fsCreate( ( BYTE * ) szDest, FC_NORMAL ) ) == F_ERROR ) + while( ( fhndDest = hb_fsCreate( ( BYTE * ) szDest, FC_NORMAL ) ) == FS_ERROR ) { WORD wResult = hb_errRT_BASE_Ext1( EG_CREATE, 2012, NULL, szDest, hb_fsError(), EF_CANDEFAULT | EF_CANRETRY ); @@ -60,7 +60,7 @@ static BOOL hb_fsCopy( char * szSource, char * szDest ) break; } - if( fhndDest != F_ERROR ) + if( fhndDest != FS_ERROR ) { #ifdef OS_UNIX_COMPATIBLE struct stat struFileInfo; diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index b1acebc922..a070162bab 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -337,8 +337,8 @@ FHANDLE hb_fsOpen( BYTE * pFilename, USHORT uiFlags ) #else - hFileHandle = F_ERROR; - s_uiErrorLast = F_ERROR; + hFileHandle = FS_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -370,8 +370,8 @@ FHANDLE hb_fsCreate( BYTE * pFilename, USHORT uiFlags ) #else - hFileHandle = F_ERROR; - s_uiErrorLast = F_ERROR; + hFileHandle = FS_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -388,7 +388,7 @@ void hb_fsClose( FHANDLE hFileHandle ) #else - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -432,7 +432,7 @@ void hb_fsSetDevMode( FHANDLE hFileHandle, USHORT uiDevMode ) #else - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -453,7 +453,7 @@ USHORT hb_fsRead( FHANDLE hFileHandle, BYTE * pBuff, USHORT uiCount ) #else uiRead = 0; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -475,7 +475,7 @@ USHORT hb_fsWrite( FHANDLE hFileHandle, BYTE * pBuff, USHORT uiCount ) #else uiWritten = 0; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -506,7 +506,7 @@ ULONG hb_fsReadLarge( FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount ) #else - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -537,7 +537,7 @@ ULONG hb_fsWriteLarge( FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount ) #else - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -576,7 +576,7 @@ ULONG hb_fsSeek( FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) #else ulPos = 0; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -620,7 +620,7 @@ int hb_fsDelete( BYTE * pFilename ) #else iResult = -1; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -642,7 +642,7 @@ int hb_fsRename( BYTE * pOldName, BYTE * pNewName ) #else iResult = -1; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -695,7 +695,7 @@ BOOL hb_fsLock ( FHANDLE hFileHandle, ULONG ulStart, #else iResult = 1; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -722,7 +722,7 @@ void hb_fsCommit( FHANDLE hFileHandle ) #else - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif } @@ -746,7 +746,7 @@ BOOL hb_fsMkDir( BYTE * pDirname ) #else iResult = 1; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -766,7 +766,7 @@ BOOL hb_fsChDir( BYTE * pDirname ) #else iResult = 1; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -786,7 +786,7 @@ BOOL hb_fsRmDir( BYTE * pDirname ) #else iResult = 1; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -810,7 +810,7 @@ BYTE * hb_fsCurDir( USHORT uiDrive ) #else cwd_buff[ 0 ] = '\0'; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -834,13 +834,13 @@ USHORT hb_fsChDrv( BYTE nDrive ) else { _chdrive( uiSave ); - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; } #else uiResult = 0; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -860,7 +860,7 @@ BYTE hb_fsCurDrv( void ) #else uiResult = 0; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -886,13 +886,13 @@ USHORT hb_fsIsDrv( BYTE nDrive ) { uiResult = 0; _chdrive( uiSave ); - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; } #else uiResult = 0; - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; #endif @@ -905,7 +905,7 @@ FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, USHORT uiFlags, BYTE * pPaths, PHB_ITEM pError ) { - s_uiErrorLast = F_ERROR; + s_uiErrorLast = FS_ERROR; HB_SYMBOL_UNUSED( pFilename ); HB_SYMBOL_UNUSED( pDefExt ); @@ -913,7 +913,7 @@ FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, HB_SYMBOL_UNUSED( pPaths ); HB_SYMBOL_UNUSED( pError ); - return F_ERROR; + return FS_ERROR; } /* @@ -937,7 +937,7 @@ HARBOUR HB_FCREATE( void ) hFileHandle = hb_fsCreate( ( BYTE * ) hb_parc( 1 ), ISNUM( 2 ) ? hb_parni( 2 ) : FC_NORMAL ); else - hFileHandle = F_ERROR; + hFileHandle = FS_ERROR; hb_retni( hFileHandle ); } diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index 8014de3ae4..8cecd86ee7 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -238,7 +238,7 @@ static char * set_string( PHB_ITEM pItem, char * old_str ) static void close_binary( FHANDLE handle ) { - if( handle != F_ERROR ) + if( handle != FS_ERROR ) { /* Close the file handle without disrupting the current user file error value */ @@ -250,7 +250,7 @@ static void close_binary( FHANDLE handle ) static void close_text( FHANDLE handle ) { - if( handle != F_ERROR ) + if( handle != FS_ERROR ) { /* Close the file handle without disrupting the current user file error value */ @@ -287,8 +287,8 @@ static FHANDLE open_handle( char * file_name, BOOL bAppend, char * def_ext, HB_s /* QUESTION: What sharing mode does Clipper use ? [vszel] */ - handle = F_ERROR; - while( handle == F_ERROR ) + handle = FS_ERROR; + while( handle == FS_ERROR ) { BOOL bCreate = FALSE; WORD wResult; @@ -299,7 +299,7 @@ static FHANDLE open_handle( char * file_name, BOOL bAppend, char * def_ext, HB_s { /* If the file already exists, open it (in read-write mode, in case of non-Unix and text modes). */ handle = hb_fsOpen( ( BYTE * ) path, FO_READWRITE | FO_DENYWRITE ); - if( handle != F_ERROR ) + if( handle != FS_ERROR ) { /* Position to EOF */ #if ! defined(HB_OS_UNIX_COMPATIBLE) /* Non-Unix needs special binary vs. text file handling */ @@ -328,7 +328,7 @@ static FHANDLE open_handle( char * file_name, BOOL bAppend, char * def_ext, HB_s if( bCreate ) handle = hb_fsCreate( ( BYTE * ) path, FC_NORMAL ); - if( handle == F_ERROR ) + if( handle == FS_ERROR ) { /* NOTE: using switch() here will result in a compiler warning */ if( set_specifier == HB_SET_ALTFILE ) @@ -929,9 +929,9 @@ HARBOUR HB_SET( void ) void hb_setInitialize( void ) { hb_set_century = FALSE; - hb_set_althan = F_ERROR; - hb_set_extrahan = F_ERROR; - hb_set_printhan = F_ERROR; + hb_set_althan = FS_ERROR; + hb_set_extrahan = FS_ERROR; + hb_set_printhan = FS_ERROR; hb_set.HB_SET_ALTERNATE = FALSE; hb_set.HB_SET_ALTFILE = NULL; hb_set.HB_SET_BELL = FALSE;