From 185f03cbfd19fc045329fb022bdbd6ba7a3befb3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 3 Feb 2009 14:29:35 +0000 Subject: [PATCH] 2009-02-03 15:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbapirdd.h * source/rdd/dbcmd.c * source/rdd/dbcmd53.c * source/rdd/dbcmdx.c * source/rdd/dbdetach.c * source/rdd/dbf1.c * source/rdd/dbsql.c * source/rdd/delim1.c * source/rdd/hbdbsort.c * source/rdd/sdf1.c * source/rdd/wacore.c * source/rdd/wafunc.c * source/rdd/workarea.c * source/rdd/dbfcdx/dbfcdx1.c * source/rdd/dbffpt/dbffpt1.c * source/rdd/dbfnsx/dbfnsx1.c * source/rdd/dbfntx/dbfntx1.c * source/rdd/hbsix/sxcrypt.c * source/rdd/hbsix/sxord.c * source/rdd/hbsix/sxtable.c * source/rdd/hsx/hsx.c * source/rdd/nulsys/nulsys.c * source/rdd/usrrdd/rdds/arrayrdd.prg * source/rdd/usrrdd/rdds/fcomma.prg * source/rdd/usrrdd/rdds/hscdx.prg * source/rdd/usrrdd/rdds/logrdd.prg * source/rdd/usrrdd/rdds/rlcdx.prg * source/rdd/usrrdd/usrrdd.c * SUCCESS -> HB_SUCCESS * FAILURE -> HB_FAILURE * ERRCODE -> HB_ERRCODE --- harbour/ChangeLog | 33 + harbour/include/hbapirdd.h | 142 ++-- harbour/source/rdd/dbcmd.c | 74 +- harbour/source/rdd/dbcmd53.c | 10 +- harbour/source/rdd/dbcmdx.c | 22 +- harbour/source/rdd/dbdetach.c | 2 +- harbour/source/rdd/dbf1.c | 802 ++++++++++---------- harbour/source/rdd/dbfcdx/dbfcdx1.c | 384 +++++----- harbour/source/rdd/dbffpt/dbffpt1.c | 448 +++++------ harbour/source/rdd/dbfnsx/dbfnsx1.c | 430 +++++------ harbour/source/rdd/dbfntx/dbfntx1.c | 430 +++++------ harbour/source/rdd/dbsql.c | 20 +- harbour/source/rdd/delim1.c | 168 ++-- harbour/source/rdd/hbdbsort.c | 4 +- harbour/source/rdd/hbsix/sxcrypt.c | 2 +- harbour/source/rdd/hbsix/sxord.c | 52 +- harbour/source/rdd/hbsix/sxtable.c | 24 +- harbour/source/rdd/hsx/hsx.c | 38 +- harbour/source/rdd/nulsys/nulsys.c | 32 +- harbour/source/rdd/sdf1.c | 168 ++-- harbour/source/rdd/usrrdd/rdds/arrayrdd.prg | 96 +-- harbour/source/rdd/usrrdd/rdds/fcomma.prg | 36 +- harbour/source/rdd/usrrdd/rdds/hscdx.prg | 8 +- harbour/source/rdd/usrrdd/rdds/logrdd.prg | 21 +- harbour/source/rdd/usrrdd/rdds/rlcdx.prg | 26 +- harbour/source/rdd/usrrdd/usrrdd.c | 299 ++++---- harbour/source/rdd/wacore.c | 28 +- harbour/source/rdd/wafunc.c | 176 ++--- harbour/source/rdd/workarea.c | 392 +++++----- 29 files changed, 2199 insertions(+), 2168 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c27e970b05..3ac2f1e634 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,39 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-03 15:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * include/hbapirdd.h + * source/rdd/dbcmd.c + * source/rdd/dbcmd53.c + * source/rdd/dbcmdx.c + * source/rdd/dbdetach.c + * source/rdd/dbf1.c + * source/rdd/dbsql.c + * source/rdd/delim1.c + * source/rdd/hbdbsort.c + * source/rdd/sdf1.c + * source/rdd/wacore.c + * source/rdd/wafunc.c + * source/rdd/workarea.c + * source/rdd/dbfcdx/dbfcdx1.c + * source/rdd/dbffpt/dbffpt1.c + * source/rdd/dbfnsx/dbfnsx1.c + * source/rdd/dbfntx/dbfntx1.c + * source/rdd/hbsix/sxcrypt.c + * source/rdd/hbsix/sxord.c + * source/rdd/hbsix/sxtable.c + * source/rdd/hsx/hsx.c + * source/rdd/nulsys/nulsys.c + * source/rdd/usrrdd/rdds/arrayrdd.prg + * source/rdd/usrrdd/rdds/fcomma.prg + * source/rdd/usrrdd/rdds/hscdx.prg + * source/rdd/usrrdd/rdds/logrdd.prg + * source/rdd/usrrdd/rdds/rlcdx.prg + * source/rdd/usrrdd/usrrdd.c + * SUCCESS -> HB_SUCCESS + * FAILURE -> HB_FAILURE + * ERRCODE -> HB_ERRCODE + 2009-02-03 15:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbapigt.h * contrib/hbct/screen1.c diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h index 8e604face5..b404265eae 100644 --- a/harbour/include/hbapirdd.h +++ b/harbour/include/hbapirdd.h @@ -69,7 +69,7 @@ HB_EXTERN_BEGIN /* #define HB_MAX_RDD_FIELDNAME_LEN 32 */ #define HB_RDD_MAX_AREA_NUM 65535 -/* Compatibility #defines. These will be removed, so +/* Compatibility #defines. These will be removed, so please use the new names in your code. */ #ifdef HB_LEGACY_LEVEL #define HARBOUR_MAX_RDD_DRIVERNAME_LENGTH HB_RDD_MAX_DRIVERNAME_LEN @@ -1149,90 +1149,90 @@ typedef RDDNODE * LPRDDNODE; * PROTOTYPES * ---------- */ - + /* internal RDD functions */ extern void hb_rddCloseDetachedAreas( void ); /* RDD virtual machine integration functions */ -extern HB_EXPORT void hb_rddShutDown( void ); -extern HB_EXPORT ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); -extern HB_EXPORT ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); -extern HB_EXPORT ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); -extern HB_EXPORT ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); -extern HB_EXPORT int hb_rddGetCurrentWorkAreaNumber( void ); -extern HB_EXPORT ERRCODE hb_rddSelectWorkAreaNumber( int iArea ); -extern HB_EXPORT ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ); -extern HB_EXPORT ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ); -extern HB_EXPORT ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ); +extern HB_EXPORT void hb_rddShutDown( void ); +extern HB_EXPORT HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); +extern HB_EXPORT HB_ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); +extern HB_EXPORT HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); +extern HB_EXPORT HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ); +extern HB_EXPORT int hb_rddGetCurrentWorkAreaNumber( void ); +extern HB_EXPORT HB_ERRCODE hb_rddSelectWorkAreaNumber( int iArea ); +extern HB_EXPORT HB_ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ); +extern HB_EXPORT HB_ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ); +extern HB_EXPORT HB_ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ); /* other functions */ -extern HB_EXPORT void * hb_rddAllocWorkAreaAlias( const char * szAlias, int iArea ); -extern HB_EXPORT void * hb_rddGetCurrentWorkAreaPointer( void ); -extern HB_EXPORT void * hb_rddGetWorkAreaPointer( int iArea ); -extern HB_EXPORT USHORT hb_rddInsertAreaNode( const char *szDriver ); -extern HB_EXPORT void hb_rddReleaseCurrentArea( void ); +extern HB_EXPORT void * hb_rddAllocWorkAreaAlias( const char * szAlias, int iArea ); +extern HB_EXPORT void * hb_rddGetCurrentWorkAreaPointer( void ); +extern HB_EXPORT void * hb_rddGetWorkAreaPointer( int iArea ); +extern HB_EXPORT USHORT hb_rddInsertAreaNode( const char *szDriver ); +extern HB_EXPORT void hb_rddReleaseCurrentArea( void ); -extern HB_EXPORT int hb_rddRegister( const char * szDriver, USHORT uiType ); -extern HB_EXPORT ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * pSuperTable, const char * szDrvName ); -extern HB_EXPORT LPRDDNODE hb_rddGetNode( USHORT uiNode ); -extern HB_EXPORT LPRDDNODE hb_rddFindNode( const char * szDriver, USHORT * uiIndex ); -extern HB_EXPORT USHORT hb_rddFieldIndex( AREAP pArea, const char * szName ); -extern HB_EXPORT USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField ); +extern HB_EXPORT int hb_rddRegister( const char * szDriver, USHORT uiType ); +extern HB_EXPORT HB_ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * pSuperTable, const char * szDrvName ); +extern HB_EXPORT LPRDDNODE hb_rddGetNode( USHORT uiNode ); +extern HB_EXPORT LPRDDNODE hb_rddFindNode( const char * szDriver, USHORT * uiIndex ); +extern HB_EXPORT USHORT hb_rddFieldIndex( AREAP pArea, const char * szName ); +extern HB_EXPORT USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField ); extern HB_EXPORT const char * hb_rddDefaultDrv( const char * szDriver ); -extern HB_EXPORT ERRCODE hb_rddSelectFirstAvailable( void ); -extern HB_EXPORT ERRCODE hb_rddVerifyAliasName( const char * szAlias ); -extern HB_EXPORT void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ); -extern HB_EXPORT PHB_ITEM hb_rddList( USHORT uiType ); -extern HB_EXPORT void hb_rddCloseAll( void ); -extern HB_EXPORT void hb_rddFlushAll( void ); -extern HB_EXPORT void hb_rddUnLockAll( void ); -extern HB_EXPORT BOOL hb_rddGetNetErr( void ); -extern HB_EXPORT void hb_rddSetNetErr( BOOL fNetErr ); +extern HB_EXPORT HB_ERRCODE hb_rddSelectFirstAvailable( void ); +extern HB_EXPORT HB_ERRCODE hb_rddVerifyAliasName( const char * szAlias ); +extern HB_EXPORT void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ); +extern HB_EXPORT PHB_ITEM hb_rddList( USHORT uiType ); +extern HB_EXPORT void hb_rddCloseAll( void ); +extern HB_EXPORT void hb_rddFlushAll( void ); +extern HB_EXPORT void hb_rddUnLockAll( void ); +extern HB_EXPORT BOOL hb_rddGetNetErr( void ); +extern HB_EXPORT void hb_rddSetNetErr( BOOL fNetErr ); -extern HB_EXPORT ERRCODE hb_rddOpenTable( - const char * szFileName, const char * szDriver, - USHORT uiArea, const char *szAlias, - BOOL fShared, BOOL fReadonly, - const char * szCpId, ULONG ulConnection, - PHB_ITEM pStruct, PHB_ITEM pDelim ); -extern HB_EXPORT ERRCODE hb_rddCreateTable( - const char * szFileName, const char * szDriver, - USHORT uiArea, const char *szAlias, - BOOL fKeepOpen, - const char * szCpId, ULONG ulConnection, - PHB_ITEM pStruct, PHB_ITEM pDelim ); -extern HB_EXPORT ERRCODE hb_dbTransStruct( - AREAP lpaSource, AREAP lpaDest, - LPDBTRANSINFO lpdbTransInfo, - PHB_ITEM *pStruct, PHB_ITEM pFields ); -extern HB_EXPORT ERRCODE hb_rddTransRecords( - AREAP pArea, - const char *szFileName, const char *szDriver, - ULONG ulConnection, - PHB_ITEM pFields, BOOL fExport, - PHB_ITEM pCobFor, PHB_ITEM pStrFor, - PHB_ITEM pCobWhile, PHB_ITEM pStrWhile, - PHB_ITEM pNext, PHB_ITEM pRecID, - PHB_ITEM pRest, - const char *szCpId, - PHB_ITEM pDelim ); -extern HB_EXPORT void hb_tblStructure( AREAP pArea, PHB_ITEM pStruct, USHORT uiSize ); -extern HB_EXPORT ERRCODE hb_rddCloseAllParentRelations( AREAP pArea ); +extern HB_EXPORT HB_ERRCODE hb_rddOpenTable( + const char * szFileName, const char * szDriver, + USHORT uiArea, const char *szAlias, + BOOL fShared, BOOL fReadonly, + const char * szCpId, ULONG ulConnection, + PHB_ITEM pStruct, PHB_ITEM pDelim ); +extern HB_EXPORT HB_ERRCODE hb_rddCreateTable( + const char * szFileName, const char * szDriver, + USHORT uiArea, const char *szAlias, + BOOL fKeepOpen, + const char * szCpId, ULONG ulConnection, + PHB_ITEM pStruct, PHB_ITEM pDelim ); +extern HB_EXPORT HB_ERRCODE hb_dbTransStruct( + AREAP lpaSource, AREAP lpaDest, + LPDBTRANSINFO lpdbTransInfo, + PHB_ITEM *pStruct, PHB_ITEM pFields ); +extern HB_EXPORT HB_ERRCODE hb_rddTransRecords( + AREAP pArea, + const char *szFileName, const char *szDriver, + ULONG ulConnection, + PHB_ITEM pFields, BOOL fExport, + PHB_ITEM pCobFor, PHB_ITEM pStrFor, + PHB_ITEM pCobWhile, PHB_ITEM pStrWhile, + PHB_ITEM pNext, PHB_ITEM pRecID, + PHB_ITEM pRest, + const char *szCpId, + PHB_ITEM pDelim ); +extern HB_EXPORT void hb_tblStructure( AREAP pArea, PHB_ITEM pStruct, USHORT uiSize ); +extern HB_EXPORT HB_ERRCODE hb_rddCloseAllParentRelations( AREAP pArea ); -extern HB_EXPORT ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ); -extern HB_EXPORT AREAP hb_rddRequestArea( char * szAlias, PHB_ITEM pCargo, - BOOL fNewArea, BOOL fWait ); +extern HB_EXPORT HB_ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ); +extern HB_EXPORT AREAP hb_rddRequestArea( char * szAlias, PHB_ITEM pCargo, + BOOL fNewArea, BOOL fWait ); #if 0 -extern HB_EXPORT ERRCODE hb_rddDisinherit( const char * drvName ); -extern HB_EXPORT USHORT hb_rddGetCurrentFieldPos( const char * szName ); -extern HB_EXPORT USHORT hb_rddExtendType( HB_TYPE fieldType ); -extern HB_EXPORT HB_TYPE hb_rddFieldType( USHORT extendType ); +extern HB_EXPORT HB_ERRCODE hb_rddDisinherit( const char * drvName ); +extern HB_EXPORT USHORT hb_rddGetCurrentFieldPos( const char * szName ); +extern HB_EXPORT USHORT hb_rddExtendType( HB_TYPE fieldType ); +extern HB_EXPORT HB_TYPE hb_rddFieldType( USHORT extendType ); #endif -typedef ERRCODE ( * WACALLBACK )( AREAP, void * ); -extern HB_EXPORT ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ); -extern HB_EXPORT ERRCODE hb_rddGetTempAlias( char * szAliasTmp ); +typedef HB_ERRCODE ( * WACALLBACK )( AREAP, void * ); +extern HB_EXPORT HB_ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ); +extern HB_EXPORT HB_ERRCODE hb_rddGetTempAlias( char * szAliasTmp ); HB_EXTERN_END diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index da042445cc..462138f47c 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -89,7 +89,7 @@ HB_FUNC( AFIELDS ) return; } - if( SELF_FIELDCOUNT( pArea, &uiFields ) != SUCCESS ) + if( SELF_FIELDCOUNT( pArea, &uiFields ) != HB_SUCCESS ) return; if( pName ) @@ -128,7 +128,7 @@ HB_FUNC( AFIELDS ) { for( uiCount = 1; uiCount <= uiFields; ++uiCount ) { - if( SELF_FIELDINFO( pArea, uiCount, DBS_NAME, hb_arrayGetItemPtr( pName, uiCount ) ) != SUCCESS ) + if( SELF_FIELDINFO( pArea, uiCount, DBS_NAME, hb_arrayGetItemPtr( pName, uiCount ) ) != HB_SUCCESS ) return; } } @@ -136,7 +136,7 @@ HB_FUNC( AFIELDS ) { for( uiCount = 1; uiCount <= uiFields; ++uiCount ) { - if( SELF_FIELDINFO( pArea, uiCount, DBS_TYPE, hb_arrayGetItemPtr( pType, uiCount ) ) != SUCCESS ) + if( SELF_FIELDINFO( pArea, uiCount, DBS_TYPE, hb_arrayGetItemPtr( pType, uiCount ) ) != HB_SUCCESS ) return; } } @@ -144,7 +144,7 @@ HB_FUNC( AFIELDS ) { for( uiCount = 1; uiCount <= uiFields; ++uiCount ) { - if( SELF_FIELDINFO( pArea, uiCount, DBS_LEN, hb_arrayGetItemPtr( pLen, uiCount ) ) != SUCCESS ) + if( SELF_FIELDINFO( pArea, uiCount, DBS_LEN, hb_arrayGetItemPtr( pLen, uiCount ) ) != HB_SUCCESS ) return; } } @@ -152,7 +152,7 @@ HB_FUNC( AFIELDS ) { for( uiCount = 1; uiCount <= uiFields; ++uiCount ) { - if( SELF_FIELDINFO( pArea, uiCount, DBS_DEC, hb_arrayGetItemPtr( pDec, uiCount ) ) != SUCCESS ) + if( SELF_FIELDINFO( pArea, uiCount, DBS_DEC, hb_arrayGetItemPtr( pDec, uiCount ) ) != HB_SUCCESS ) return; } } @@ -161,7 +161,7 @@ HB_FUNC( AFIELDS ) { for( uiCount = 1; uiCount <= uiFields; ++uiCount ) { - if( SELF_FIELDINFO( pArea, uiCount, DBS_FLAG, hb_arrayGetItemPtr( pFlags, uiCount ) ) != SUCCESS ) + if( SELF_FIELDINFO( pArea, uiCount, DBS_FLAG, hb_arrayGetItemPtr( pFlags, uiCount ) ) != HB_SUCCESS ) return; } } @@ -181,7 +181,7 @@ HB_FUNC( ALIAS ) { char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ]; - if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == SUCCESS ) + if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == HB_SUCCESS ) { hb_retc( szAlias ); return; @@ -254,7 +254,7 @@ HB_FUNC( DBF ) { char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ]; - if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == SUCCESS ) + if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == HB_SUCCESS ) { hb_retc( szAlias ); return; @@ -281,12 +281,12 @@ HB_FUNC( DBAPPEND ) if( pArea ) { BOOL bUnLockAll = ISLOG( 1 ) ? hb_parl( 1 ) : TRUE; - ERRCODE errCode; + HB_ERRCODE errCode; /* Clipper clears NETERR flag before APPEND */ hb_rddSetNetErr( FALSE ); errCode = SELF_APPEND( pArea, bUnLockAll ); - hb_retl( errCode == SUCCESS ); + hb_retl( errCode == HB_SUCCESS ); } else hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); @@ -395,7 +395,7 @@ HB_FUNC( DBCREATE ) fCurrArea ? hb_rddGetCurrentWorkAreaNumber() : 0, szAlias, fKeepOpen, szCpId, ulConnection, - pStruct, pDelim ) == SUCCESS ); + pStruct, pDelim ) == HB_SUCCESS ); } /* @@ -411,7 +411,7 @@ HB_FUNC( __DBOPENSDF ) PHB_ITEM pStruct, pFieldDesc, pDelim; BOOL fKeepOpen, fCurrArea; ULONG ulConnection; - ERRCODE errCode; + HB_ERRCODE errCode; /* * NOTE: 4-th and 5-th parameters are undocumented Clipper ones @@ -460,10 +460,10 @@ HB_FUNC( __DBOPENSDF ) szCpId, ulConnection, pStruct, pDelim ); - if( !fKeepOpen && errCode == SUCCESS ) + if( !fKeepOpen && errCode == HB_SUCCESS ) hb_rddReleaseCurrentArea(); - hb_retl( errCode == SUCCESS ); + hb_retl( errCode == HB_SUCCESS ); } @@ -548,7 +548,7 @@ HB_FUNC( __DBLOCATE ) dbScopeInfo.fIgnoreDuplicates = FALSE; dbScopeInfo.fBackward = FALSE; - if( SELF_SETLOCATE( pArea, &dbScopeInfo ) == SUCCESS ) + if( SELF_SETLOCATE( pArea, &dbScopeInfo ) == HB_SUCCESS ) SELF_LOCATE( pArea, FALSE ); } else @@ -686,9 +686,9 @@ HB_FUNC( DBSEEK ) PHB_ITEM pKey = hb_param( 1, HB_IT_ANY ); BOOL bSoftSeek = ISLOG( 2 ) ? ( BOOL ) hb_parl( 2 ) : hb_setGetSoftSeek(); BOOL bFindLast = ISLOG( 3 ) ? hb_parl( 3 ) : FALSE, fFound = FALSE; - if( SELF_SEEK( pArea, bSoftSeek, pKey, bFindLast ) == SUCCESS ) + if( SELF_SEEK( pArea, bSoftSeek, pKey, bFindLast ) == HB_SUCCESS ) { - if( SELF_FOUND( pArea, &fFound ) != SUCCESS ) + if( SELF_FOUND( pArea, &fFound ) != HB_SUCCESS ) fFound = FALSE; } hb_retl( fFound ); @@ -840,7 +840,7 @@ HB_FUNC( DBUSEAREA ) hb_retl( hb_rddOpenTable( hb_parc( 3 ), hb_parc( 2 ), hb_parl( 1 ) ? 0 : hb_rddGetCurrentWorkAreaNumber(), hb_parc( 4 ), ISLOG( 5 ) ? hb_parl( 5 ) : !hb_setGetExclusive(), - hb_parl( 6 ), hb_parc( 7 ), hb_parnl( 8 ), NULL, NULL ) == SUCCESS ); + hb_parl( 6 ), hb_parc( 7 ), hb_parnl( 8 ), NULL, NULL ) == HB_SUCCESS ); } HB_FUNC( __DBZAP ) @@ -905,7 +905,7 @@ HB_FUNC( FIELDNAME ) if( pArea && uiIndex ) { - if( SELF_FIELDCOUNT( pArea, &uiFields ) == SUCCESS && + if( SELF_FIELDCOUNT( pArea, &uiFields ) == HB_SUCCESS && uiIndex <= uiFields ) { szName = ( char * ) hb_xgrab( pArea->uiMaxFieldNameLength + 1 ); @@ -944,7 +944,7 @@ HB_FUNC( FIELDPUT ) PHB_ITEM pItem = hb_param( 2, HB_IT_ANY ); if( pItem && !HB_IS_NIL( pItem ) ) { - if( SELF_PUTVALUE( pArea, uiIndex, pItem ) == SUCCESS ) + if( SELF_PUTVALUE( pArea, uiIndex, pItem ) == HB_SUCCESS ) { hb_itemReturn( pItem ); } @@ -1194,7 +1194,7 @@ HB_FUNC( ORDCONDSET ) lpdbOrdCondInfo->fScoped = !lpdbOrdCondInfo->fAll; lpdbOrdCondInfo->lpvCargo = NULL; - hb_retl( SELF_ORDSETCOND( pArea, lpdbOrdCondInfo ) == SUCCESS ); + hb_retl( SELF_ORDSETCOND( pArea, lpdbOrdCondInfo ) == HB_SUCCESS ); } else hb_retl( FALSE ); @@ -1254,7 +1254,7 @@ HB_FUNC( ORDBAGCLEAR ) pOrderInfo.atomBagName = hb_param( 1, HB_IT_STRING ); if( !pOrderInfo.atomBagName ) pOrderInfo.atomBagName = hb_param( 1, HB_IT_NUMERIC ); - hb_retl( SELF_ORDLSTDELETE( pArea, &pOrderInfo ) == SUCCESS ); + hb_retl( SELF_ORDLSTDELETE( pArea, &pOrderInfo ) == HB_SUCCESS ); } else hb_retl( FALSE ); @@ -1272,7 +1272,7 @@ HB_FUNC( ORDDESTROY ) if( !pOrderInfo.itmOrder ) pOrderInfo.itmOrder = hb_param( 1, HB_IT_NUMERIC ); pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING ); - hb_retl( SELF_ORDDESTROY( pArea, &pOrderInfo ) == SUCCESS ); + hb_retl( SELF_ORDDESTROY( pArea, &pOrderInfo ) == HB_SUCCESS ); } else hb_retl( FALSE ); @@ -1353,7 +1353,7 @@ HB_FUNC( ORDLISTADD ) if( pArea ) { DBORDERINFO pOrderInfo; - ERRCODE errCode; + HB_ERRCODE errCode; /* Clipper clears NETERR flag when index is open */ hb_rddSetNetErr( FALSE ); @@ -1374,7 +1374,7 @@ HB_FUNC( ORDLISTADD ) errCode = SELF_ORDLSTADD( pArea, &pOrderInfo ); if( !pOrderInfo.itmResult || HB_IS_NIL( pOrderInfo.itmResult ) ) - hb_retl( errCode == SUCCESS ); + hb_retl( errCode == HB_SUCCESS ); else hb_itemReturn( pOrderInfo.itmResult ); @@ -1595,7 +1595,7 @@ HB_FUNC( SELECT ) * I do not like this Clipper behavior, in some constructions * programmer may use "" in some others not. [Druzus] */ - if( hb_rddVerifyAliasName( szAlias ) == SUCCESS ) + if( hb_rddVerifyAliasName( szAlias ) == HB_SUCCESS ) #endif hb_rddGetAliasNumber( szAlias, &iArea ); } @@ -1905,12 +1905,12 @@ HB_FUNC( __DBTRANS ) { DBTRANSINFO dbTransInfo; PHB_ITEM pFields = hb_param( 2, HB_IT_ARRAY ); - ERRCODE errCode; + HB_ERRCODE errCode; memset( &dbTransInfo, 0, sizeof( DBTRANSINFO ) ); errCode = hb_dbTransStruct( pSrcArea, pDstArea, &dbTransInfo, NULL, pFields ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { hb_rddSelectWorkAreaNumber( dbTransInfo.lpaSource->uiArea ); @@ -1934,7 +1934,7 @@ HB_FUNC( __DBTRANS ) if( dbTransInfo.lpTransItems ) hb_xfree( dbTransInfo.lpTransItems ); - hb_retl( errCode == SUCCESS ); + hb_retl( errCode == HB_SUCCESS ); } else hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); @@ -1949,7 +1949,7 @@ HB_FUNC( __DBAPP ) { AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); if( pArea ) - hb_retl( SUCCESS == hb_rddTransRecords( pArea, + hb_retl( HB_SUCCESS == hb_rddTransRecords( pArea, hb_parc( 1 ), /* file name */ hb_parc( 8 ), /* RDD */ hb_parnl( 9 ), /* connection */ @@ -1972,7 +1972,7 @@ HB_FUNC( __DBCOPY ) { AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); if( pArea ) - hb_retl( SUCCESS == hb_rddTransRecords( pArea, + hb_retl( HB_SUCCESS == hb_rddTransRecords( pArea, hb_parc( 1 ), /* file name */ hb_parc( 8 ), /* RDD */ hb_parnl( 9 ), /* connection */ @@ -1995,7 +1995,7 @@ HB_FUNC( HB_RDDGETTEMPALIAS ) { char szAliasTmp[ HB_RDD_MAX_ALIAS_LEN + 1 ]; - if( hb_rddGetTempAlias( szAliasTmp ) == SUCCESS ) + if( hb_rddGetTempAlias( szAliasTmp ) == HB_SUCCESS ) hb_retc( szAliasTmp ); } @@ -2056,7 +2056,7 @@ HB_FUNC( HB_DBDROP ) if( pRDDNode && pName ) hb_retl( SELF_DROP( pRDDNode, pName, hb_param( 2, HB_IT_STRING ), - ulConnection ) == SUCCESS ); + ulConnection ) == HB_SUCCESS ); else hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } @@ -2081,7 +2081,7 @@ HB_FUNC( HB_DBEXISTS ) if( pRDDNode && pName ) hb_retl( SELF_EXISTS( pRDDNode, pName, hb_param( 2, HB_IT_STRING ), - ulConnection ) == SUCCESS ); + ulConnection ) == HB_SUCCESS ); else hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } @@ -2098,7 +2098,7 @@ HB_FUNC( HB_FIELDLEN ) { PHB_ITEM pItem = hb_itemNew( NULL ); - if( SELF_FIELDINFO( pArea, uiIndex, DBS_LEN, pItem ) == SUCCESS ) + if( SELF_FIELDINFO( pArea, uiIndex, DBS_LEN, pItem ) == HB_SUCCESS ) { hb_itemReturnRelease( pItem ); return; @@ -2122,7 +2122,7 @@ HB_FUNC( HB_FIELDDEC ) { PHB_ITEM pItem = hb_itemNew( NULL ); - if( SELF_FIELDINFO( pArea, uiIndex, DBS_DEC, pItem ) == SUCCESS ) + if( SELF_FIELDINFO( pArea, uiIndex, DBS_DEC, pItem ) == HB_SUCCESS ) { hb_itemReturnRelease( pItem ); return; @@ -2146,7 +2146,7 @@ HB_FUNC( HB_FIELDTYPE ) { PHB_ITEM pItem = hb_itemNew( NULL ); - if( SELF_FIELDINFO( pArea, uiIndex, DBS_TYPE, pItem ) == SUCCESS ) + if( SELF_FIELDINFO( pArea, uiIndex, DBS_TYPE, pItem ) == HB_SUCCESS ) { hb_itemReturnRelease( pItem ); return; diff --git a/harbour/source/rdd/dbcmd53.c b/harbour/source/rdd/dbcmd53.c index 56eeeed5e4..0435d8ed92 100644 --- a/harbour/source/rdd/dbcmd53.c +++ b/harbour/source/rdd/dbcmd53.c @@ -405,7 +405,7 @@ HB_FUNC( DBFIELDINFO ) pType = hb_param( 1 , HB_IT_NUMERIC ); uiIndex = hb_parni( 2 ); - if( pType && SELF_FIELDCOUNT( pArea, &uiFields ) == SUCCESS && + if( pType && SELF_FIELDCOUNT( pArea, &uiFields ) == HB_SUCCESS && uiIndex > 0 && uiIndex <= uiFields ) { PHB_ITEM pInfo = hb_itemNew( hb_param( 3, HB_IT_ANY ) ); @@ -464,11 +464,11 @@ HB_FUNC( DBFILEGET ) pMode = hb_param( 3, HB_IT_NUMERIC ); if( uiIndex > 0 && pMode && hb_parclen( 2 ) > 0 && - SELF_FIELDCOUNT( pArea, &uiFields ) == SUCCESS && + SELF_FIELDCOUNT( pArea, &uiFields ) == HB_SUCCESS && uiIndex <= uiFields ) { hb_retl( SELF_GETVALUEFILE( pArea, uiIndex, hb_parc( 2 ), - hb_itemGetNI( pMode ) ) == SUCCESS ); + hb_itemGetNI( pMode ) ) == HB_SUCCESS ); } else hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEGETBADPARAMETER, NULL, HB_ERR_FUNCNAME ); @@ -494,11 +494,11 @@ HB_FUNC( DBFILEPUT ) else uiIndex = hb_parni( 1 ); if( uiIndex > 0 && hb_parclen( 2 ) > 0 && - SELF_FIELDCOUNT( pArea, &uiFields ) == SUCCESS && + SELF_FIELDCOUNT( pArea, &uiFields ) == HB_SUCCESS && uiIndex <= uiFields ) { hb_retl( SELF_PUTVALUEFILE( pArea, uiIndex, hb_parc( 2 ), - hb_parni( 3 ) ) == SUCCESS ); + hb_parni( 3 ) ) == HB_SUCCESS ); } else hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEPUTBADPARAMETER, NULL, HB_ERR_FUNCNAME ); diff --git a/harbour/source/rdd/dbcmdx.c b/harbour/source/rdd/dbcmdx.c index a7195ad894..c032a3740d 100644 --- a/harbour/source/rdd/dbcmdx.c +++ b/harbour/source/rdd/dbcmdx.c @@ -84,7 +84,7 @@ HB_FUNC( ORDWILDSEEK ) { BOOL fCont = hb_parl( 2 ), fBack = hb_parl( 3 ), fFound = FALSE; DBORDERINFO OrderInfo; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; memset( &OrderInfo, 0, sizeof( DBORDERINFO ) ); OrderInfo.itmResult = hb_itemNew( NULL ); @@ -98,21 +98,21 @@ HB_FUNC( ORDWILDSEEK ) else errCode = SELF_GOTOP( pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = SELF_ORDINFO( pArea, DBOI_KEYVAL, &OrderInfo ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { szKey = hb_itemGetCPtr( OrderInfo.itmResult ); fFound = hb_strMatchWild( szKey, szPattern ); } } } - if( !fFound && errCode == SUCCESS ) + if( !fFound && errCode == HB_SUCCESS ) { OrderInfo.itmNewVal = hb_param( 1, HB_IT_STRING ); if( SELF_ORDINFO( pArea, fBack ? DBOI_SKIPWILDBACK : DBOI_SKIPWILD, - &OrderInfo ) == SUCCESS ) + &OrderInfo ) == HB_SUCCESS ) fFound = hb_itemGetL( OrderInfo.itmResult ); } hb_itemRelease( OrderInfo.itmResult ); @@ -136,7 +136,7 @@ HB_FUNC( DBSKIPPER ) BOOL fBEof; ULONG ulRecords = 0; - if( SELF_RECCOUNT( pArea, &ulRecords ) == SUCCESS && ulRecords > 0 ) + if( SELF_RECCOUNT( pArea, &ulRecords ) == HB_SUCCESS && ulRecords > 0 ) { if( ISNUM( 1 ) ) lRecs = hb_parnl( 1 ); @@ -145,13 +145,13 @@ HB_FUNC( DBSKIPPER ) SELF_SKIP( pArea, 0 ); else if( lRecs > 0 ) { - if( SELF_EOF( pArea, &fBEof ) == SUCCESS ) + if( SELF_EOF( pArea, &fBEof ) == HB_SUCCESS ) { while( lSkipped < lRecs ) { - if( SELF_SKIP( pArea, 1 ) != SUCCESS ) + if( SELF_SKIP( pArea, 1 ) != HB_SUCCESS ) break; - if( SELF_EOF( pArea, &fBEof ) != SUCCESS ) + if( SELF_EOF( pArea, &fBEof ) != HB_SUCCESS ) break; if( fBEof ) { @@ -166,9 +166,9 @@ HB_FUNC( DBSKIPPER ) { while( lSkipped > lRecs ) { - if( SELF_SKIP( pArea, -1 ) != SUCCESS ) + if( SELF_SKIP( pArea, -1 ) != HB_SUCCESS ) break; - if( SELF_BOF( pArea, &fBEof ) != SUCCESS ) + if( SELF_BOF( pArea, &fBEof ) != HB_SUCCESS ) break; if( fBEof ) break; diff --git a/harbour/source/rdd/dbdetach.c b/harbour/source/rdd/dbdetach.c index f9a444bb9a..53a54fcbf9 100644 --- a/harbour/source/rdd/dbdetach.c +++ b/harbour/source/rdd/dbdetach.c @@ -89,7 +89,7 @@ HB_FUNC( HB_DBDETACH ) } if( pArea ) - hb_retl( hb_rddDetachArea( pArea, pCargo ) == SUCCESS ); + hb_retl( hb_rddDetachArea( pArea, pCargo ) == HB_SUCCESS ); else hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 1cae746a23..535d9a6d4e 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -196,8 +196,8 @@ static HB_LONG hb_dbfGetRowVer( DBFAREAP pArea, USHORT uiField, HB_LONG * pValue *pValue = 0; if( pArea->fShared && !pArea->fFLocked && !pArea->fHeaderLocked ) { - if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_LOCK, 0 ) != SUCCESS ) - return FAILURE; + if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_LOCK, 0 ) != HB_SUCCESS ) + return HB_FAILURE; fLck = TRUE; } @@ -213,11 +213,11 @@ static HB_LONG hb_dbfGetRowVer( DBFAREAP pArea, USHORT uiField, HB_LONG * pValue if( fLck ) { - if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_UNLOCK, 0 ) != SUCCESS ) - return FAILURE; + if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_UNLOCK, 0 ) != HB_SUCCESS ) + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } static HB_LONG hb_dbfGetNextValue( DBFAREAP pArea, USHORT uiField ) @@ -532,7 +532,7 @@ static BOOL hb_dbfReadRecord( DBFAREAP pArea ) return FALSE; } - if( SELF_GETREC( ( AREAP ) pArea, NULL ) == FAILURE ) + if( SELF_GETREC( ( AREAP ) pArea, NULL ) == HB_FAILURE ) return FALSE; /* Set flags */ @@ -548,7 +548,7 @@ static BOOL hb_dbfWriteRecord( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfWriteRecord(%p)", pArea)); - if( SELF_PUTREC( ( AREAP ) pArea, NULL ) == FAILURE ) + if( SELF_PUTREC( ( AREAP ) pArea, NULL ) == HB_FAILURE ) return FALSE; pArea->fRecordChanged = FALSE; @@ -638,9 +638,9 @@ static void hb_dbfTableCrypt( DBFAREAP pArea, PHB_ITEM pPasswd, BOOL fEncrypt ) { ULONG ulRecords, ulRecNo; - if( SELF_RECCOUNT( ( AREAP ) pArea, &ulRecords ) == SUCCESS ) + if( SELF_RECCOUNT( ( AREAP ) pArea, &ulRecords ) == HB_SUCCESS ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; BYTE * pOldCryptKey, * pNewCryptKey; pOldCryptKey = pArea->pCryptKey; @@ -659,11 +659,11 @@ static void hb_dbfTableCrypt( DBFAREAP pArea, PHB_ITEM pPasswd, BOOL fEncrypt ) { pArea->pCryptKey = pOldCryptKey; errCode = SELF_GOTO( ( AREAP ) pArea, ulRecNo ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; if( !hb_dbfReadRecord( pArea ) ) { - errCode = FAILURE; + errCode = HB_FAILURE; break; } pArea->pCryptKey = pNewCryptKey; @@ -671,20 +671,20 @@ static void hb_dbfTableCrypt( DBFAREAP pArea, PHB_ITEM pPasswd, BOOL fEncrypt ) if( !pArea->fRecordChanged ) { errCode = SELF_GOHOT( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } /* Force record encryption/decryption */ pArea->fEncrypted = fEncrypt; /* Save encrypted record */ errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } pArea->pCryptKey = pNewCryptKey; if( pOldCryptKey ) hb_xfree( pOldCryptKey ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pArea->fTableEncrypted = fEncrypt; pArea->fUpdateHeader = TRUE; @@ -697,9 +697,9 @@ static void hb_dbfTableCrypt( DBFAREAP pArea, PHB_ITEM pPasswd, BOOL fEncrypt ) /* * Unlock all records. */ -static ERRCODE hb_dbfUnlockAllRecords( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfUnlockAllRecords( DBFAREAP pArea ) { - ERRCODE uiError = SUCCESS; + HB_ERRCODE uiError = HB_SUCCESS; HB_TRACE(HB_TR_DEBUG, ("hb_dbfUnlockAllRecords(%p)", pArea )); @@ -720,9 +720,9 @@ static ERRCODE hb_dbfUnlockAllRecords( DBFAREAP pArea ) /* * Unlock a records. */ -static ERRCODE hb_dbfUnlockRecord( DBFAREAP pArea, ULONG ulRecNo ) +static HB_ERRCODE hb_dbfUnlockRecord( DBFAREAP pArea, ULONG ulRecNo ) { - ERRCODE uiError = SUCCESS; + HB_ERRCODE uiError = HB_SUCCESS; ULONG ulCount, * pList; HB_TRACE(HB_TR_DEBUG, ("hb_dbfUnlockRecord(%p, %lu)", pArea, ulRecNo)); @@ -758,7 +758,7 @@ static ERRCODE hb_dbfUnlockRecord( DBFAREAP pArea, ULONG ulRecNo ) /* * Lock a record. */ -static ERRCODE hb_dbfLockRecord( DBFAREAP pArea, ULONG ulRecNo, BOOL * pResult, +static HB_ERRCODE hb_dbfLockRecord( DBFAREAP pArea, ULONG ulRecNo, BOOL * pResult, BOOL bExclusive ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfLockRecord(%p, %lu, %p, %i)", pArea, ulRecNo, @@ -766,14 +766,14 @@ static ERRCODE hb_dbfLockRecord( DBFAREAP pArea, ULONG ulRecNo, BOOL * pResult, if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } if( pArea->fFLocked ) { * pResult = TRUE; - return SUCCESS; + return HB_SUCCESS; } if( ulRecNo == 0 ) @@ -791,12 +791,12 @@ static ERRCODE hb_dbfLockRecord( DBFAREAP pArea, ULONG ulRecNo, BOOL * pResult, if( pArea->pLocksPos[ ul ] == ulRecNo ) { * pResult = TRUE; - return SUCCESS; + return HB_SUCCESS; } } } - if( SELF_RAWLOCK( ( AREAP ) pArea, REC_LOCK, ulRecNo ) == SUCCESS ) + if( SELF_RAWLOCK( ( AREAP ) pArea, REC_LOCK, ulRecNo ) == HB_SUCCESS ) { if( pArea->ulNumLocksPos == 0 ) /* Create the list */ { @@ -814,26 +814,26 @@ static ERRCODE hb_dbfLockRecord( DBFAREAP pArea, ULONG ulRecNo, BOOL * pResult, { if( !pArea->fPositioned ) { - if( SELF_GOTO( ( AREAP ) pArea, pArea->ulRecNo ) != SUCCESS ) - return FAILURE; + if( SELF_GOTO( ( AREAP ) pArea, pArea->ulRecNo ) != HB_SUCCESS ) + return HB_FAILURE; } else if( !pArea->fRecordChanged ) { - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->fValidBuffer = FALSE; } } } else * pResult = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * Lock a file. */ -static ERRCODE hb_dbfLockFile( DBFAREAP pArea, BOOL * pResult ) +static HB_ERRCODE hb_dbfLockFile( DBFAREAP pArea, BOOL * pResult ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfLockFile(%p, %p)", pArea, pResult)); @@ -841,8 +841,8 @@ static ERRCODE hb_dbfLockFile( DBFAREAP pArea, BOOL * pResult ) { if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } hb_dbfUnlockAllRecords( pArea ); @@ -863,15 +863,15 @@ static ERRCODE hb_dbfLockFile( DBFAREAP pArea, BOOL * pResult ) else * pResult = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* * Unlock a file. */ -static ERRCODE hb_dbfUnlockFile( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfUnlockFile( DBFAREAP pArea ) { - ERRCODE uiError = SUCCESS; + HB_ERRCODE uiError = HB_SUCCESS; HB_TRACE(HB_TR_DEBUG, ("hb_dbfUnlockFile(%p)", pArea)); @@ -925,9 +925,9 @@ static void hb_dbfGetLockArray( DBFAREAP pArea, PHB_ITEM pItem ) * This function is common for different DBF based RDD implementation * so I don't make it static */ -ERRCODE hb_dbfGetEGcode( ERRCODE errCode ) +HB_ERRCODE hb_dbfGetEGcode( HB_ERRCODE errCode ) { - ERRCODE errEGcode; + HB_ERRCODE errEGcode; HB_TRACE(HB_TR_DEBUG, ("hb_dbfGetEGcode(%hu)", errCode)); @@ -1048,7 +1048,7 @@ void hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex, ULONG ulBlock ) * This function is common for different MEMO implementation * so I left it in DBF. */ -ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, +HB_ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, ULONG * pulBlock, ULONG * pulSize, ULONG * pulType ) { @@ -1061,12 +1061,12 @@ ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, pArea->lpFields[ uiIndex ].uiType != HB_FT_IMAGE && pArea->lpFields[ uiIndex ].uiType != HB_FT_BLOB && pArea->lpFields[ uiIndex ].uiType != HB_FT_OLE ) ) - return FAILURE; + return HB_FAILURE; if( pArea->lpFields[ uiIndex ].uiLen == 4 ) { *pulBlock = HB_GET_LE_UINT32( &pArea->pRecord[ pArea->pFieldOffset[ uiIndex ] ] ); - return SUCCESS; + return HB_SUCCESS; } else if( pArea->lpFields[ uiIndex ].uiLen == 10 ) { @@ -1102,7 +1102,7 @@ ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, else if( bByte != ' ' || ulValue ) { PHB_ITEM pError = hb_errNew(); - ERRCODE uiError; + HB_ERRCODE uiError; hb_errPutGenCode( pError, EG_CORRUPTION ); hb_errPutSubCode( pError, EDBF_CORRUPT ); @@ -1112,15 +1112,15 @@ ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, uiError = SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return uiError == E_DEFAULT ? SUCCESS : FAILURE; + return uiError == E_DEFAULT ? HB_SUCCESS : HB_FAILURE; } } *pulBlock = ulValue; } - return SUCCESS; + return HB_SUCCESS; } - return FAILURE; + return HB_FAILURE; } /* @@ -1128,7 +1128,7 @@ ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, * This function is common for different MEMO implementation * so I left it in DBF. */ -ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex, +HB_ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex, ULONG ulBlock, ULONG ulSize, ULONG ulType ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfSetMemoData(%p, %hu, %lu, %lu, %lu)", pArea, uiIndex, ulBlock, ulSize, ulType)); @@ -1138,12 +1138,12 @@ ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex, pArea->lpFields[ uiIndex ].uiType != HB_FT_IMAGE && pArea->lpFields[ uiIndex ].uiType != HB_FT_BLOB && pArea->lpFields[ uiIndex ].uiType != HB_FT_OLE ) ) - return FAILURE; + return HB_FAILURE; if( pArea->lpFields[ uiIndex ].uiLen == 4 ) { HB_PUT_LE_UINT32( &pArea->pRecord[ pArea->pFieldOffset[ uiIndex ] ], ulBlock ); - return SUCCESS; + return HB_SUCCESS; } else if( pArea->lpFields[ uiIndex ].uiLen == 10 ) { @@ -1172,10 +1172,10 @@ ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex, } } } - return SUCCESS; + return HB_SUCCESS; } - return FAILURE; + return HB_FAILURE; } /* @@ -1284,7 +1284,7 @@ BOOL hb_dbfLockIdxFile( PHB_FILE pFile, BYTE bScheme, USHORT usMode, HB_FOFFSET /* * Get DBF locking parameters */ -static ERRCODE hb_dbfLockData( DBFAREAP pArea, +static HB_ERRCODE hb_dbfLockData( DBFAREAP pArea, HB_FOFFSET * ulPos, HB_FOFFSET * ulFlSize, HB_FOFFSET * ulRlSize, int * iDir ) { @@ -1339,9 +1339,9 @@ static ERRCODE hb_dbfLockData( DBFAREAP pArea, default: *ulPos = *ulFlSize = *ulRlSize = 0; *iDir = 0; - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* @@ -1351,63 +1351,63 @@ static ERRCODE hb_dbfLockData( DBFAREAP pArea, /* * Determine logical beginning of file. */ -static ERRCODE hb_dbfBof( DBFAREAP pArea, BOOL * pBof ) +static HB_ERRCODE hb_dbfBof( DBFAREAP pArea, BOOL * pBof ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfBof(%p, %p)", pArea, pBof)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } * pBof = pArea->fBof; - return SUCCESS; + return HB_SUCCESS; } /* * Determine logical end of file. */ -static ERRCODE hb_dbfEof( DBFAREAP pArea, BOOL * pEof ) +static HB_ERRCODE hb_dbfEof( DBFAREAP pArea, BOOL * pEof ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfEof(%p, %p)", pArea, pEof)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } * pEof = pArea->fEof; - return SUCCESS; + return HB_SUCCESS; } /* * Determine outcome of the last search operation. */ -static ERRCODE hb_dbfFound( DBFAREAP pArea, BOOL * pFound ) +static HB_ERRCODE hb_dbfFound( DBFAREAP pArea, BOOL * pFound ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfFound(%p, %p)", pArea, pFound)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } * pFound = pArea->fFound; - return SUCCESS; + return HB_SUCCESS; } /* * Position cursor at the last record. */ -static ERRCODE hb_dbfGoBottom( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfGoBottom( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfGoBottom(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; /* Update record count */ if( pArea->fShared ) @@ -1415,8 +1415,8 @@ static ERRCODE hb_dbfGoBottom( DBFAREAP pArea ) pArea->fTop = FALSE; pArea->fBottom = TRUE; - if( SELF_GOTO( ( AREAP ) pArea, pArea->ulRecCount ) != SUCCESS ) - return FAILURE; + if( SELF_GOTO( ( AREAP ) pArea, pArea->ulRecCount ) != HB_SUCCESS ) + return HB_FAILURE; return SELF_SKIPFILTER( ( AREAP ) pArea, -1 ); } @@ -1424,19 +1424,19 @@ static ERRCODE hb_dbfGoBottom( DBFAREAP pArea ) /* * Position cursor at a specific physical record. */ -static ERRCODE hb_dbfGoTo( DBFAREAP pArea, ULONG ulRecNo ) +static HB_ERRCODE hb_dbfGoTo( DBFAREAP pArea, ULONG ulRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfGoTo(%p, %lu)", pArea, ulRecNo)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( pArea->lpdbPendingRel ) { if( pArea->lpdbPendingRel->isScoped ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } else /* Reset parent rel struct */ pArea->lpdbPendingRel = NULL; @@ -1467,13 +1467,13 @@ static ERRCODE hb_dbfGoTo( DBFAREAP pArea, ULONG ulRecNo ) if( pArea->lpdbRelations ) return SELF_SYNCCHILDREN( ( AREAP ) pArea ); else - return SUCCESS; + return HB_SUCCESS; } /* * Position the cursor to a specific, physical identity. */ -static ERRCODE hb_dbfGoToId( DBFAREAP pArea, PHB_ITEM pItem ) +static HB_ERRCODE hb_dbfGoToId( DBFAREAP pArea, PHB_ITEM pItem ) { PHB_ITEM pError; @@ -1489,22 +1489,22 @@ static ERRCODE hb_dbfGoToId( DBFAREAP pArea, PHB_ITEM pItem ) hb_errPutSubCode( pError, EDBF_DATATYPE ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } } /* * Position cursor at the first record. */ -static ERRCODE hb_dbfGoTop( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfGoTop( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfGoTop(%p)", pArea)); pArea->fTop = TRUE; pArea->fBottom = FALSE; - if( SELF_GOTO( ( AREAP ) pArea, 1 ) == FAILURE ) - return FAILURE; + if( SELF_GOTO( ( AREAP ) pArea, 1 ) == HB_FAILURE ) + return HB_FAILURE; return SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } @@ -1512,16 +1512,16 @@ static ERRCODE hb_dbfGoTop( DBFAREAP pArea ) /* * Reposition cursor relative to current position. */ -static ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_dbfSkip(%p, %ld)", pArea, lToSkip)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } pArea->fTop = pArea->fBottom = FALSE; @@ -1536,7 +1536,7 @@ static ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ) as it should, Druzus */ /* Move first record and set Bof flag */ - if( uiError == SUCCESS && pArea->fBof && lToSkip < 0 ) + if( uiError == HB_SUCCESS && pArea->fBof && lToSkip < 0 ) { uiError = SELF_GOTOP( ( AREAP ) pArea ); pArea->fBof = TRUE; @@ -1554,16 +1554,16 @@ static ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ) /* * Reposition cursor, regardless of filter. */ -static ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, LONG lToSkip ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_dbfSkipRaw(%p, %ld)", pArea, lToSkip)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } if( lToSkip == 0 ) @@ -1596,7 +1596,7 @@ static ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, LONG lToSkip ) /* * Add a field to the WorkArea. */ -static ERRCODE hb_dbfAddField( DBFAREAP pArea, LPDBFIELDINFO pFieldInfo ) +static HB_ERRCODE hb_dbfAddField( DBFAREAP pArea, LPDBFIELDINFO pFieldInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfAddField(%p, %p)", pArea, pFieldInfo)); @@ -1616,22 +1616,22 @@ static ERRCODE hb_dbfAddField( DBFAREAP pArea, LPDBFIELDINFO pFieldInfo ) /* * Append a record to the WorkArea. */ -static ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ) +static HB_ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ) { ULONG ulNewRecord; PHB_ITEM pError; BOOL bLocked; - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_dbfAppend(%p, %d)", pArea, (int) bUnLockAll)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_APPEND, 0, NULL ) ) - return FAILURE; + return HB_FAILURE; } if( pArea->fReadonly ) @@ -1642,15 +1642,15 @@ static ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ) hb_errPutSubCode( pError, EDBF_READONLY ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbPendingRel ) { if( pArea->lpdbPendingRel->isScoped ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } else /* Reset parent rel struct */ pArea->lpdbPendingRel = NULL; @@ -1659,19 +1659,19 @@ static ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ) if( pArea->fShared ) { bLocked = FALSE; - if( SELF_RAWLOCK( ( AREAP ) pArea, APPEND_LOCK, 0 ) == SUCCESS ) + if( SELF_RAWLOCK( ( AREAP ) pArea, APPEND_LOCK, 0 ) == HB_SUCCESS ) { /* Update RecCount */ pArea->ulRecCount = hb_dbfCalcRecCount( pArea ); ulNewRecord = pArea->ulRecCount + 1; if( pArea->fFLocked || hb_dbfIsLocked( pArea, ulNewRecord ) ) bLocked = TRUE; - else if( hb_dbfLockRecord( pArea, ulNewRecord, &bLocked, bUnLockAll ) != SUCCESS ) + else if( hb_dbfLockRecord( pArea, ulNewRecord, &bLocked, bUnLockAll ) != HB_SUCCESS ) { if( bLocked ) hb_dbfUnlockRecord( pArea, ulNewRecord ); SELF_RAWLOCK( ( AREAP ) pArea, APPEND_UNLOCK, 0 ); - return FAILURE; + return HB_FAILURE; } } if( !bLocked ) @@ -1684,7 +1684,7 @@ static ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ) hb_errPutFlags( pError, EF_CANDEFAULT ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } } @@ -1704,82 +1704,82 @@ static ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ) SELF_RAWLOCK( ( AREAP ) pArea, APPEND_UNLOCK, 0 ); return uiError; } - return SUCCESS; + return HB_SUCCESS; } /* * Delete a record. */ -static ERRCODE hb_dbfDeleteRec( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfDeleteRec( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfDeleteRec(%p)", pArea)); if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_DELETE, 0, NULL ) ) - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; /* Buffer is hot? */ - if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pArea->pRecord[ 0 ] = '*'; pArea->fDeleted = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* * Determine deleted status for a record. */ -static ERRCODE hb_dbfDeleted( DBFAREAP pArea, BOOL * pDeleted ) +static HB_ERRCODE hb_dbfDeleted( DBFAREAP pArea, BOOL * pDeleted ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfDeleted(%p, %p)", pArea, pDeleted)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; * pDeleted = pArea->fDeleted; - return SUCCESS; + return HB_SUCCESS; } /* * Write data buffer to the data store. */ -static ERRCODE hb_dbfFlush( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfFlush( DBFAREAP pArea ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_dbfFlush(%p)", pArea)); uiError = SELF_GOCOLD( ( AREAP ) pArea ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { if( pArea->fUpdateHeader ) uiError = SELF_WRITEDBHEADER( ( AREAP ) pArea ); } - if( hb_setGetHardCommit() && uiError == SUCCESS ) + if( hb_setGetHardCommit() && uiError == HB_SUCCESS ) { if( pArea->fDataFlush ) { @@ -1799,7 +1799,7 @@ static ERRCODE hb_dbfFlush( DBFAREAP pArea ) /* * Retrieve current record buffer */ -static ERRCODE hb_dbfGetRec( DBFAREAP pArea, BYTE ** pBuffer ) +static HB_ERRCODE hb_dbfGetRec( DBFAREAP pArea, BYTE ** pBuffer ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfGetRec(%p, %p)", pArea, pBuffer)); @@ -1807,7 +1807,7 @@ static ERRCODE hb_dbfGetRec( DBFAREAP pArea, BYTE ** pBuffer ) { /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; *pBuffer = pArea->pRecord; } @@ -1828,13 +1828,13 @@ static ERRCODE hb_dbfGetRec( DBFAREAP pArea, BYTE ** pBuffer ) pArea->fEncrypted = FALSE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the current value of a field. */ -static ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { LPFIELD pField; BOOL fError; @@ -1845,13 +1845,13 @@ static ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; fError = FALSE; uiIndex--; @@ -2057,34 +2057,34 @@ static ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) hb_errPutSubCode( pError, EDBF_DATATYPE ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_GET, uiIndex + 1, pItem ) ) - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the length of a field value. */ -static ERRCODE hb_dbfGetVarLen( DBFAREAP pArea, USHORT uiIndex, ULONG * pLength ) +static HB_ERRCODE hb_dbfGetVarLen( DBFAREAP pArea, USHORT uiIndex, ULONG * pLength ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfGetVarLen(%p, %hu, %p)", pArea, uiIndex, pLength)); * pLength = pArea->lpFields[ uiIndex - 1 ].uiLen; - return SUCCESS; + return HB_SUCCESS; } /* * Perform a write of WorkArea memory to the data store. */ -static ERRCODE hb_dbfGoCold( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfGoCold( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfGoCold(%p)", pArea)); @@ -2108,7 +2108,7 @@ static ERRCODE hb_dbfGoCold( DBFAREAP pArea ) /* Write current record */ if( ! hb_dbfWriteRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; if( pArea->fAppend ) { @@ -2120,13 +2120,13 @@ static ERRCODE hb_dbfGoCold( DBFAREAP pArea ) if( pArea->fShared && pArea->fUpdateHeader ) return SELF_WRITEDBHEADER( ( AREAP ) pArea ); } - return SUCCESS; + return HB_SUCCESS; } /* * Mark the WorkArea data buffer as hot. */ -static ERRCODE hb_dbfGoHot( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfGoHot( DBFAREAP pArea ) { PHB_ITEM pError; @@ -2140,7 +2140,7 @@ static ERRCODE hb_dbfGoHot( DBFAREAP pArea ) hb_errPutSubCode( pError, EDBF_READONLY ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } else if( pArea->fShared && !pArea->fFLocked && !hb_dbfIsLocked( pArea, pArea->ulRecNo ) ) @@ -2151,16 +2151,16 @@ static ERRCODE hb_dbfGoHot( DBFAREAP pArea ) hb_errPutSubCode( pError, EDBF_UNLOCKED ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } pArea->fRecordChanged = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* * Replace the current record. */ -static ERRCODE hb_dbfPutRec( DBFAREAP pArea, BYTE * pBuffer ) +static HB_ERRCODE hb_dbfPutRec( DBFAREAP pArea, BYTE * pBuffer ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfPutRec(%p, %p)", pArea, pBuffer)); @@ -2168,22 +2168,22 @@ static ERRCODE hb_dbfPutRec( DBFAREAP pArea, BYTE * pBuffer ) { if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; - if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; /* Copy data to buffer */ memcpy( pArea->pRecord, pBuffer, pArea->uiRecordLen ); /* * TODO: such operation should be forbidden - * maybe it will be good to return FAILURE when + * maybe it will be good to return HB_FAILURE when * pArea->pRecord[ 0 ] != '*' && pArea->pRecord[ 0 ] != ' ' */ if( pArea->pRecord[ 0 ] == 'D' || pArea->pRecord[ 0 ] == 'E' ) @@ -2234,16 +2234,16 @@ static ERRCODE hb_dbfPutRec( DBFAREAP pArea, BYTE * pBuffer ) hb_errPutFileName( pError, pArea->szDataFileName ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Assign a value to a field. */ -static ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { USHORT uiSize; LPFIELD pField; @@ -2254,34 +2254,34 @@ static ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) */ char szBuffer[ 256 ]; PHB_ITEM pError; - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_dbfPutValue(%p, %hu, %p)", pArea, uiIndex, pItem)); if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_PUT, uiIndex, pItem ) ) - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; /* Buffer is hot? */ - if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; - uiError = SUCCESS; + uiError = HB_SUCCESS; uiIndex--; pField = pArea->lpFields + uiIndex; if( pField->uiType == HB_FT_MEMO || @@ -2487,7 +2487,7 @@ static ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) } /* Exit if any error */ - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { pError = hb_errNew(); hb_errPutGenCode( pError, hb_dbfGetEGcode( uiError ) ); @@ -2497,51 +2497,51 @@ static ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) hb_errPutFlags( pError, EF_CANDEFAULT ); uiError = SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return uiError == E_DEFAULT ? SUCCESS : FAILURE; + return uiError == E_DEFAULT ? HB_SUCCESS : HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Undelete the current record. */ -static ERRCODE hb_dbfRecall( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfRecall( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecall(%p)", pArea)); if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_RECALL, 0, NULL ) ) - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; /* Buffer is hot? */ - if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->pRecord[ 0 ] = ' '; pArea->fDeleted = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain number of records in WorkArea. */ -static ERRCODE hb_dbfRecCount( DBFAREAP pArea, ULONG * pRecCount ) +static HB_ERRCODE hb_dbfRecCount( DBFAREAP pArea, ULONG * pRecCount ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecCount(%p, %p)", pArea, pRecCount)); @@ -2550,32 +2550,32 @@ static ERRCODE hb_dbfRecCount( DBFAREAP pArea, ULONG * pRecCount ) pArea->ulRecCount = hb_dbfCalcRecCount( pArea ); * pRecCount = pArea->ulRecCount; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain physical row number at current WorkArea cursor position. */ -static ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * ulRecNo ) +static HB_ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * ulRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecNo(%p, %p)", pArea, ulRecNo)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } *ulRecNo = pArea->ulRecNo; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain physical row ID at current WorkArea cursor position. */ -static ERRCODE hb_dbfRecId( DBFAREAP pArea, PHB_ITEM pRecNo ) +static HB_ERRCODE hb_dbfRecId( DBFAREAP pArea, PHB_ITEM pRecNo ) { - ERRCODE errCode; + HB_ERRCODE errCode; ULONG ulRecNo; HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecId(%p, %p)", pArea, pRecNo)); @@ -2602,12 +2602,12 @@ static ERRCODE hb_dbfRecId( DBFAREAP pArea, PHB_ITEM pRecNo ) /* * Establish the extent of the array of fields for a WorkArea. */ -static ERRCODE hb_dbfSetFieldExtent( DBFAREAP pArea, USHORT uiFieldExtent ) +static HB_ERRCODE hb_dbfSetFieldExtent( DBFAREAP pArea, USHORT uiFieldExtent ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfSetFieldExtent(%p, %hu)", pArea, uiFieldExtent)); - if( SUPER_SETFIELDEXTENT( ( AREAP ) pArea, uiFieldExtent ) == FAILURE ) - return FAILURE; + if( SUPER_SETFIELDEXTENT( ( AREAP ) pArea, uiFieldExtent ) == HB_FAILURE ) + return HB_FAILURE; /* Alloc field offsets array */ if( uiFieldExtent ) @@ -2616,20 +2616,20 @@ static ERRCODE hb_dbfSetFieldExtent( DBFAREAP pArea, USHORT uiFieldExtent ) memset( pArea->pFieldOffset, 0, uiFieldExtent * sizeof( USHORT ) ); } - return SUCCESS; + return HB_SUCCESS; } /* * Close the table in the WorkArea. */ -static ERRCODE hb_dbfClose( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfClose( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfClose(%p)", pArea)); if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_PRECLOSE, 0, NULL ) ) - return FAILURE; + return HB_FAILURE; } /* Reset parent rel struct */ @@ -2709,15 +2709,15 @@ static ERRCODE hb_dbfClose( DBFAREAP pArea ) pArea->fTrigger = FALSE; } - return SUCCESS; + return HB_SUCCESS; } /* * Create a data store in the specified WorkArea. */ -static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) +static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; ULONG ulSize; USHORT uiCount; BOOL fRetry, fError, fRawBlob; @@ -2736,12 +2736,12 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) if( ! pFileName->szExtension && hb_setGetDefExtension() ) { pItem = hb_itemPutC( pItem, NULL ); - if( SELF_INFO( ( AREAP ) pArea, DBI_TABLEEXT, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_TABLEEXT, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); hb_xfree( pFileName ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pFileName->szExtension = hb_itemGetCPtr( pItem ); hb_fsFNameMerge( ( char * ) szFileName, pFileName ); @@ -2753,17 +2753,17 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) hb_xfree( pFileName ); pItem = hb_itemPutL( pItem, FALSE ); - fRawBlob = SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_BLOB_SUPPORT, pCreateInfo->ulConnection, pItem ) == SUCCESS && + fRawBlob = SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_BLOB_SUPPORT, pCreateInfo->ulConnection, pItem ) == HB_SUCCESS && hb_itemGetL( pItem ); if( pArea->bTableType == 0 ) { pItem = hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( ( AREAP ) pArea, DBI_TABLETYPE, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_TABLETYPE, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pArea->bTableType = hb_itemGetNI( pItem ); } @@ -2771,11 +2771,11 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) if( pArea->bLockType == 0 ) { pItem = hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( ( AREAP ) pArea, DBI_LOCKSCHEME, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_LOCKSCHEME, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pArea->bLockType = hb_itemGetNI( pItem ); if( pArea->bLockType == 0 ) @@ -2792,11 +2792,11 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) { /* get memo type */ pItem = hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOTYPE, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOTYPE, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pArea->bMemoType = ( BYTE ) hb_itemGetNI( pItem ); } @@ -2817,7 +2817,7 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } if( !fRawBlob ) @@ -2856,7 +2856,7 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) if( ! pArea->pDataFile ) { pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } } @@ -3071,7 +3071,7 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pThisField++; } @@ -3102,7 +3102,7 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) pItem = hb_itemNew( NULL ); if( SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_PENDINGPASSWORD, - pCreateInfo->ulConnection, pItem ) == SUCCESS ) + pCreateInfo->ulConnection, pItem ) == HB_SUCCESS ) { if( hb_dbfPasswordSet( pArea, pItem, FALSE ) ) pArea->fTableEncrypted = TRUE; @@ -3111,7 +3111,7 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) { hb_itemClear( pItem ); if( SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_PASSWORD, - pCreateInfo->ulConnection, pItem ) == SUCCESS ) + pCreateInfo->ulConnection, pItem ) == HB_SUCCESS ) { if( hb_dbfPasswordSet( pArea, pItem, FALSE ) ) pArea->fTableEncrypted = TRUE; @@ -3125,7 +3125,7 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) pArea->fUpdateHeader = TRUE; /* Write header */ errCode = SELF_WRITEDBHEADER( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_xfree( pBuffer ); SELF_CLOSE( ( AREAP ) pArea ); @@ -3149,7 +3149,7 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) hb_xfree( pBuffer ); SELF_CLOSE( ( AREAP ) pArea ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pArea->fDataFlush = TRUE; @@ -3167,12 +3167,12 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) errCode = SELF_CREATEMEMFILE( ( AREAP ) pArea, pCreateInfo ); } /* If successful call SUPER_CREATE to finish system jobs */ - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = SUPER_CREATE( ( AREAP ) pArea, pCreateInfo ); } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); pArea->lpdbOpenInfo = NULL; @@ -3194,9 +3194,9 @@ static ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) /* * Retrieve information about the current driver. */ -static ERRCODE hb_dbfInfo( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_dbfInfo( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; HB_TRACE(HB_TR_DEBUG, ("hb_dbfInfo(%p, %hu, %p)", pArea, uiIndex, pItem)); @@ -3412,18 +3412,18 @@ static ERRCODE hb_dbfInfo( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) /* * Retrieve information about a raw */ -static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, PHB_ITEM pInfo ) +static HB_ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, PHB_ITEM pInfo ) { ULONG ulRecNo = hb_itemGetNL( pRecID ), ulPrevRec = 0; - ERRCODE errResult = SUCCESS; + HB_ERRCODE errResult = HB_SUCCESS; BOOL bDeleted; HB_TRACE(HB_TR_DEBUG, ("hb_dbfRecInfo(%p, %p, %hu, %p)", pArea, pRecID, uiInfoType, pInfo)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } if( ulRecNo == 0 ) @@ -3441,7 +3441,7 @@ static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType case DBRI_RAWDATA: ulPrevRec = pArea->ulRecNo; errResult = SELF_GOTO( ( AREAP ) pArea, ulRecNo ); - if( errResult != SUCCESS ) + if( errResult != HB_SUCCESS ) return errResult; break; } @@ -3451,7 +3451,7 @@ static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType { case DBRI_DELETED: errResult = SELF_DELETED( ( AREAP ) pArea, &bDeleted ); - if( errResult == SUCCESS ) + if( errResult == HB_SUCCESS ) hb_itemPutL( pInfo, bDeleted ); break; @@ -3475,14 +3475,14 @@ static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType case DBRI_ENCRYPTED: if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - errResult = FAILURE; + errResult = HB_FAILURE; else hb_itemPutL( pInfo, pArea->fEncrypted ); break; case DBRI_RAWRECORD: if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - errResult = FAILURE; + errResult = HB_FAILURE; else hb_itemPutCL( pInfo, ( char * ) pArea->pRecord, pArea->uiRecordLen ); break; @@ -3496,7 +3496,7 @@ static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) { - errResult = FAILURE; + errResult = HB_FAILURE; break; } ulLength = uiInfoType == DBRI_RAWDATA ? pArea->uiRecordLen : 0; @@ -3516,7 +3516,7 @@ static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType pArea->lpFields[ uiFields ].uiType == HB_FT_OLE ) { errResult = SELF_GETVALUE( ( AREAP ) pArea, uiFields + 1, pInfo ); - if( errResult != SUCCESS ) + if( errResult != HB_SUCCESS ) break; ulLen = hb_itemGetCLen( pInfo ); if( ulLen > 0 ) @@ -3537,9 +3537,9 @@ static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType } if( ulPrevRec != 0 ) { - if( SELF_GOTO( ( AREAP ) pArea, ulPrevRec ) != SUCCESS && - errResult == SUCCESS ) - errResult = FAILURE; + if( SELF_GOTO( ( AREAP ) pArea, ulPrevRec ) != HB_SUCCESS && + errResult == HB_SUCCESS ) + errResult = HB_FAILURE; } return errResult; } @@ -3547,12 +3547,12 @@ static ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType /* * Clear the WorkArea for use. */ -static ERRCODE hb_dbfNewArea( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfNewArea( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfNewArea(%p)", pArea)); - if( SUPER_NEW( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SUPER_NEW( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pArea->pDataFile = pArea->pMemoFile = pArea->pMemoTmpFile = NULL; pArea->fDataFlush = pArea->fMemoFlush = FALSE; @@ -3560,15 +3560,15 @@ static ERRCODE hb_dbfNewArea( DBFAREAP pArea ) pArea->uiDirtyRead = HB_IDXREAD_DEFAULT; /* Size for deleted records flag */ pArea->uiRecordLen = 1; - return SUCCESS; + return HB_SUCCESS; } /* * Open a data store in the WorkArea. */ -static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) { - ERRCODE errCode; + HB_ERRCODE errCode; USHORT uiFlags, uiFields, uiCount, uiSkip; ULONG ulSize; BOOL fRetry, fRawBlob; @@ -3585,9 +3585,9 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) pArea->lpdbOpenInfo = pOpenInfo; pItem = hb_itemNew( NULL ); - + if( SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_PENDINGTRIGGER, - pOpenInfo->ulConnection, pItem ) == SUCCESS ) + pOpenInfo->ulConnection, pItem ) == HB_SUCCESS ) { if( HB_IS_STRING( pItem ) ) hb_dbfTriggerSet( pArea, pItem ); @@ -3596,7 +3596,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) if( !pArea->fTrigger ) { if( SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_TRIGGER, - pOpenInfo->ulConnection, pItem ) == SUCCESS ) + pOpenInfo->ulConnection, pItem ) == HB_SUCCESS ) { if( HB_IS_STRING( pItem ) ) hb_dbfTriggerSet( pArea, pItem ); @@ -3610,7 +3610,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) { hb_itemRelease( pItem ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } hb_strncpy( ( char * ) szFileName, hb_itemGetCPtr( pItem ), sizeof( szFileName ) - 1 ); } @@ -3620,11 +3620,11 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) if( !pArea->bLockType ) { hb_itemClear( pItem ); - if( SELF_INFO( ( AREAP ) pArea, DBI_LOCKSCHEME, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_LOCKSCHEME, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pArea->bLockType = hb_itemGetNI( pItem ); if( !pArea->bLockType ) @@ -3658,12 +3658,12 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) if( ! pFileName->szExtension && hb_setGetDefExtension() ) { hb_itemClear( pItem ); - if( SELF_INFO( ( AREAP ) pArea, DBI_TABLEEXT, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_TABLEEXT, pItem ) != HB_SUCCESS ) { hb_xfree( pFileName ); hb_itemRelease( pItem ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } pFileName->szExtension = hb_itemGetCPtr( pItem ); hb_fsFNameMerge( ( char * ) szFileName, pFileName ); @@ -3678,7 +3678,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) hb_xfree( pFileName ); hb_itemClear( pItem ); - fRawBlob = SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_BLOB_SUPPORT, pOpenInfo->ulConnection, pItem ) == SUCCESS && + fRawBlob = SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_BLOB_SUPPORT, pOpenInfo->ulConnection, pItem ) == HB_SUCCESS && hb_itemGetL( pItem ); hb_itemRelease( pItem ); @@ -3726,7 +3726,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) { SELF_CLOSE( ( AREAP ) pArea ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } /* Allocate only after succesfully open file */ @@ -3734,7 +3734,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) /* Read file header and exit if error */ errCode = SELF_READDBHEADER( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); pArea->lpdbOpenInfo = NULL; @@ -3753,7 +3753,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) if( hb_fileReadAt( pArea->pDataFile, pBuffer, ulSize, sizeof( DBFHEADER ) ) != ulSize ) { - errCode = FAILURE; + errCode = HB_FAILURE; if( !pError ) { pError = hb_errNew(); @@ -3767,7 +3767,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) } else { - errCode = SUCCESS; + errCode = HB_SUCCESS; break; } } while( fRetry ); @@ -3778,7 +3778,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) } /* Exit if error */ - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { if( pBuffer ) hb_xfree( pBuffer ); @@ -3811,13 +3811,13 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) #ifdef HB_C52_STRICT if( uiFields == 0 ) { - errCode = FAILURE; + errCode = HB_FAILURE; } else #endif { errCode = SELF_SETFIELDEXTENT( ( AREAP ) pArea, uiFields ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); pArea->lpdbOpenInfo = NULL; @@ -3898,7 +3898,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) */ /* if( pField->bLen > 20 ) - errCode = FAILURE; + errCode = HB_FAILURE; */ break; @@ -3913,7 +3913,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) dbFieldInfo.uiType = HB_FT_DOUBLE; dbFieldInfo.uiDec = pField->bDec; if( dbFieldInfo.uiLen != 8 ) - errCode = FAILURE; + errCode = HB_FAILURE; break; /* types which are not supported by VM - mapped to different ones */ @@ -3923,33 +3923,33 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) else if( dbFieldInfo.uiLen == 4 ) dbFieldInfo.uiType = HB_FT_TIME; else - errCode = FAILURE; + errCode = HB_FAILURE; break; case '@': dbFieldInfo.uiType = HB_FT_DAYTIME; if( dbFieldInfo.uiLen != 8 ) - errCode = FAILURE; + errCode = HB_FAILURE; break; case '=': dbFieldInfo.uiType = HB_FT_MODTIME; if( dbFieldInfo.uiLen != 8 ) - errCode = FAILURE; + errCode = HB_FAILURE; pArea->fModStamp = TRUE; break; case '^': dbFieldInfo.uiType = HB_FT_ROWVER; if( dbFieldInfo.uiLen != 8 ) - errCode = FAILURE; + errCode = HB_FAILURE; pArea->fModStamp = TRUE; break; case '+': dbFieldInfo.uiType = HB_FT_AUTOINC; if( dbFieldInfo.uiLen != 4 ) - errCode = FAILURE; + errCode = HB_FAILURE; pArea->fAutoInc = TRUE; break; @@ -4009,23 +4009,23 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) } default: - errCode = FAILURE; + errCode = HB_FAILURE; break; } /* Add field */ - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_ADDFIELD( ( AREAP ) pArea, &dbFieldInfo ); /* Exit if error */ - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } if( pBuffer ) hb_xfree( pBuffer ); /* Exit if error */ - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { if( hb_vmRequestQuery() == 0 ) { @@ -4045,7 +4045,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) pItem = hb_itemNew( NULL ); if( SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_PENDINGPASSWORD, - pOpenInfo->ulConnection, pItem ) == SUCCESS ) + pOpenInfo->ulConnection, pItem ) == HB_SUCCESS ) { hb_dbfPasswordSet( pArea, pItem, FALSE ); } @@ -4053,7 +4053,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) { hb_itemClear( pItem ); if( SELF_RDDINFO( SELF_RDDNODE( pArea ), RDDI_PASSWORD, - pOpenInfo->ulConnection, pItem ) == SUCCESS ) + pOpenInfo->ulConnection, pItem ) == HB_SUCCESS ) { hb_dbfPasswordSet( pArea, pItem, FALSE ); } @@ -4071,17 +4071,17 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) errCode = SELF_OPENMEMFILE( ( AREAP ) pArea, pOpenInfo ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { /* If successful call SUPER_OPEN to finish system jobs */ errCode = SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ); } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); pArea->lpdbOpenInfo = NULL; - return FAILURE; + return HB_FAILURE; } /* Alloc buffer */ @@ -4105,19 +4105,19 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) /* * Retrieve the size of the WorkArea structure. */ -static ERRCODE hb_dbfStructSize( DBFAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_dbfStructSize( DBFAREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfStrucSize(%p, %p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( DBFAREA ); - return SUCCESS; + return HB_SUCCESS; } /* * Pack helper function called for each packed record */ -static ERRCODE hb_dbfPackRec( DBFAREAP pArea, ULONG ulRecNo, BOOL *fWritten ) +static HB_ERRCODE hb_dbfPackRec( DBFAREAP pArea, ULONG ulRecNo, BOOL *fWritten ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfPackRec(%p, %lu, %p)", pArea, ulRecNo, fWritten)); @@ -4125,13 +4125,13 @@ static ERRCODE hb_dbfPackRec( DBFAREAP pArea, ULONG ulRecNo, BOOL *fWritten ) *fWritten = !pArea->fDeleted; - return SUCCESS; + return HB_SUCCESS; } /* * Remove records marked for deletion from a database. */ -static ERRCODE hb_dbfPack( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfPack( DBFAREAP pArea ) { ULONG ulRecIn, ulRecOut, ulEvery, ulUserEvery; PHB_ITEM pError, pBlock; @@ -4147,7 +4147,7 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) hb_errPutSubCode( pError, EDBF_READONLY ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } if( pArea->fShared ) { @@ -4157,17 +4157,17 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) hb_errPutSubCode( pError, EDBF_SHARED ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_PACK, 0, NULL ) ) - return FAILURE; + return HB_FAILURE; } - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; /* This is bad hack but looks that people begins to use it :-( * so I'll add workaround to make it m ore safe @@ -4194,17 +4194,17 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) ulRecIn = 1; while( ulRecIn <= pArea->ulRecCount ) { - if( SELF_GOTO( ( AREAP ) pArea, ulRecIn ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, ulRecIn ) != HB_SUCCESS ) { if( pBlock ) hb_itemRelease( pBlock ); - return FAILURE; + return HB_FAILURE; } if( !hb_dbfReadRecord( pArea ) ) { if( pBlock ) hb_itemRelease( pBlock ); - return FAILURE; + return HB_FAILURE; } /* Execute the Code Block */ @@ -4213,19 +4213,19 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) if( ++ulEvery >= ulUserEvery ) { ulEvery = 0; - if( SELF_EVALBLOCK( ( AREAP ) pArea, pBlock ) != SUCCESS ) + if( SELF_EVALBLOCK( ( AREAP ) pArea, pBlock ) != HB_SUCCESS ) { hb_itemRelease( pBlock ); - return FAILURE; + return HB_FAILURE; } } } - if( SELF_PACKREC( ( AREAP ) pArea, ulRecOut + 1, &fWritten ) != SUCCESS ) + if( SELF_PACKREC( ( AREAP ) pArea, ulRecOut + 1, &fWritten ) != HB_SUCCESS ) { if( pBlock ) hb_itemRelease( pBlock ); - return FAILURE; + return HB_FAILURE; } if( fWritten ) @@ -4239,7 +4239,7 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) { if( pBlock ) hb_itemRelease( pBlock ); - return FAILURE; + return HB_FAILURE; } } } @@ -4251,10 +4251,10 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) { if( ulEvery > 0 ) { - if( SELF_EVALBLOCK( ( AREAP ) pArea, pBlock ) != SUCCESS ) + if( SELF_EVALBLOCK( ( AREAP ) pArea, pBlock ) != HB_SUCCESS ) { hb_itemRelease( pBlock ); - return FAILURE; + return HB_FAILURE; } } hb_itemRelease( pBlock ); @@ -4265,8 +4265,8 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) pArea->ulRecCount = ulRecOut; /* Force write new header */ pArea->fUpdateHeader = TRUE; - if( SELF_WRITEDBHEADER( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_WRITEDBHEADER( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } return SELF_GOTO( ( AREAP ) pArea, 1 ); } @@ -4291,24 +4291,24 @@ void hb_dbfTranslateRec( DBFAREAP pArea, BYTE * pBuffer, PHB_CODEPAGE cdp_src, P /* * Physically reorder a database. */ -static ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo ) +static HB_ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo ) { ULONG ulRecNo; USHORT uiCount; BOOL bMoreRecords, bLimited, bValidRecord; - ERRCODE uiError; + HB_ERRCODE uiError; DBQUICKSORT dbQuickSort; BYTE * pBuffer; HB_TRACE(HB_TR_DEBUG, ("hb_dbfSort(%p, %p)", pArea, pSortInfo)); - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; if( !hb_dbQSortInit( &dbQuickSort, pSortInfo, pArea->uiRecordLen ) ) - return FAILURE; + return HB_FAILURE; - uiError = SUCCESS; + uiError = HB_SUCCESS; uiCount = 0; pBuffer = dbQuickSort.pBuffer; ulRecNo = 1; @@ -4333,24 +4333,24 @@ static ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo ) bLimited = FALSE; } - while( uiError == SUCCESS && !pArea->fEof && bMoreRecords ) + while( uiError == HB_SUCCESS && !pArea->fEof && bMoreRecords ) { if( pSortInfo->dbtri.dbsci.itmCobWhile ) { - if( SELF_EVALBLOCK( ( AREAP ) pArea, pSortInfo->dbtri.dbsci.itmCobWhile ) != SUCCESS ) + if( SELF_EVALBLOCK( ( AREAP ) pArea, pSortInfo->dbtri.dbsci.itmCobWhile ) != HB_SUCCESS ) { hb_dbQSortExit( &dbQuickSort ); - return FAILURE; + return HB_FAILURE; } bMoreRecords = hb_itemGetL( pArea->valResult ); } if( bMoreRecords && pSortInfo->dbtri.dbsci.itmCobFor ) { - if( SELF_EVALBLOCK( ( AREAP ) pArea, pSortInfo->dbtri.dbsci.itmCobFor ) != SUCCESS ) + if( SELF_EVALBLOCK( ( AREAP ) pArea, pSortInfo->dbtri.dbsci.itmCobFor ) != HB_SUCCESS ) { hb_dbQSortExit( &dbQuickSort ); - return FAILURE; + return HB_FAILURE; } bValidRecord = hb_itemGetL( pArea->valResult ); } @@ -4364,7 +4364,7 @@ static ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo ) if( !hb_dbQSortAdvance( &dbQuickSort, uiCount ) ) { hb_dbQSortExit( &dbQuickSort ); - return FAILURE; + return HB_FAILURE; } pBuffer = dbQuickSort.pBuffer; uiCount = 0; @@ -4374,7 +4374,7 @@ static ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo ) if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) { hb_dbQSortExit( &dbQuickSort ); - return FAILURE; + return HB_FAILURE; } /* Copy data */ @@ -4401,19 +4401,19 @@ static ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo ) if( !hb_dbQSortAdvance( &dbQuickSort, uiCount ) ) { hb_dbQSortExit( &dbQuickSort ); - return FAILURE; + return HB_FAILURE; } } /* Sort records */ hb_dbQSortComplete( &dbQuickSort ); - return SUCCESS; + return HB_SUCCESS; } /* * Copy one or more records from one WorkArea to another. */ -static ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo ) +static HB_ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfTrans(%p, %p)", pArea, pTransInfo)); @@ -4426,10 +4426,10 @@ static ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo ) else { PHB_ITEM pPutRec = hb_itemPutL( NULL, FALSE ); - if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != HB_SUCCESS ) { hb_itemRelease( pPutRec ); - return FAILURE; + return HB_FAILURE; } if( hb_itemGetL( pPutRec ) ) pTransInfo->uiFlags |= DBTF_PUTREC; @@ -4444,7 +4444,7 @@ static ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo ) /* * Physically remove all records from data store. */ -static ERRCODE hb_dbfZap( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfZap( DBFAREAP pArea ) { PHB_ITEM pError; @@ -4458,7 +4458,7 @@ static ERRCODE hb_dbfZap( DBFAREAP pArea ) hb_errPutSubCode( pError, EDBF_READONLY ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } if( pArea->fShared ) { @@ -4468,47 +4468,47 @@ static ERRCODE hb_dbfZap( DBFAREAP pArea ) hb_errPutSubCode( pError, EDBF_SHARED ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } if( pArea->fTrigger ) { if( !hb_dbfTriggerDo( pArea, EVENT_ZAP, 0, NULL ) ) - return FAILURE; + return HB_FAILURE; } - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->fUpdateHeader = TRUE; pArea->ulRecCount = 0; - if( SELF_WRITEDBHEADER( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; - if( SELF_GOTO( ( AREAP ) pArea, 0 ) != SUCCESS ) - return FAILURE; + if( SELF_WRITEDBHEADER( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; + if( SELF_GOTO( ( AREAP ) pArea, 0 ) != HB_SUCCESS ) + return HB_FAILURE; /* Zap memo file */ if( pArea->fHasMemo ) { - if( SELF_CREATEMEMFILE( ( AREAP ) pArea, NULL ) != SUCCESS ) - return FAILURE; + if( SELF_CREATEMEMFILE( ( AREAP ) pArea, NULL ) != HB_SUCCESS ) + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Report end of relation. */ -static ERRCODE hb_dbfChildEnd( DBFAREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_dbfChildEnd( DBFAREAP pArea, LPDBRELINFO pRelInfo ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_dbfChildEnd(%p, %p)", pArea, pRelInfo)); if( pArea->lpdbPendingRel == pRelInfo ) uiError = SELF_FORCEREL( ( AREAP ) pArea ); else - uiError = SUCCESS; + uiError = HB_SUCCESS; SUPER_CHILDEND( ( AREAP ) pArea, pRelInfo ); return uiError; } @@ -4516,19 +4516,19 @@ static ERRCODE hb_dbfChildEnd( DBFAREAP pArea, LPDBRELINFO pRelInfo ) /* * Report initialization of a relation. */ -static ERRCODE hb_dbfChildStart( DBFAREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_dbfChildStart( DBFAREAP pArea, LPDBRELINFO pRelInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfChildStart(%p, %p)", pArea, pRelInfo)); - if( SELF_CHILDSYNC( ( AREAP ) pArea, pRelInfo ) != SUCCESS ) - return FAILURE; + if( SELF_CHILDSYNC( ( AREAP ) pArea, pRelInfo ) != HB_SUCCESS ) + return HB_FAILURE; return SUPER_CHILDSTART( ( AREAP ) pArea, pRelInfo ); } /* * Post a pending relational movement. */ -static ERRCODE hb_dbfChildSync( DBFAREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_dbfChildSync( DBFAREAP pArea, LPDBRELINFO pRelInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfChildSync(%p, %p)", pArea, pRelInfo)); @@ -4555,21 +4555,21 @@ static ERRCODE hb_dbfChildSync( DBFAREAP pArea, LPDBRELINFO pRelInfo ) * Druzus. */ - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->lpdbPendingRel = pRelInfo; if( pArea->lpdbRelations ) return SELF_SYNCCHILDREN( ( AREAP ) pArea ); - return SUCCESS; + return HB_SUCCESS; } /* * Force relational seeks in the specified WorkArea. */ -static ERRCODE hb_dbfForceRel( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfForceRel( DBFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfForceRel(%p)", pArea)); @@ -4586,20 +4586,20 @@ static ERRCODE hb_dbfForceRel( DBFAREAP pArea ) return SELF_RELEVAL( ( AREAP ) pArea, lpdbPendingRel ); } - return SUCCESS; + return HB_SUCCESS; } /* * Set the filter condition for the specified WorkArea. */ -static ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo ) +static HB_ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfSetFilter(%p, %p)", pArea, pFilterInfo)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } return SUPER_SETFILTER( ( AREAP ) pArea, pFilterInfo ); @@ -4608,9 +4608,9 @@ static ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo ) /* * Perform a network lowlevel lock in the specified WorkArea. */ -static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) +static HB_ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) { - ERRCODE uiErr = SUCCESS; + HB_ERRCODE uiErr = HB_SUCCESS; HB_FOFFSET ulPos, ulFlSize, ulRlSize; int iDir; BOOL fLck; @@ -4619,8 +4619,8 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) if( pArea->fShared ) { - if( hb_dbfLockData( pArea, &ulPos, &ulFlSize, &ulRlSize, &iDir ) == FAILURE ) - return FAILURE; + if( hb_dbfLockData( pArea, &ulPos, &ulFlSize, &ulRlSize, &iDir ) == HB_FAILURE ) + return HB_FAILURE; switch( uiAction ) { @@ -4633,7 +4633,7 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) fLck = hb_fileLock( pArea->pDataFile, ulPos + 1, ulFlSize, FL_LOCK ); if( !fLck ) - uiErr = FAILURE; + uiErr = HB_FAILURE; else pArea->fFLocked = TRUE; } @@ -4648,7 +4648,7 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) fLck = hb_fileLock( pArea->pDataFile, ulPos + 1, ulFlSize, FL_UNLOCK ); if( !fLck ) - uiErr = FAILURE; + uiErr = HB_FAILURE; pArea->fFLocked = FALSE; } break; @@ -4664,7 +4664,7 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) fLck = hb_fileLock( pArea->pDataFile, ulPos + ulRecNo, ulRlSize, FL_LOCK ); if( !fLck ) - uiErr = FAILURE; + uiErr = HB_FAILURE; } break; @@ -4678,7 +4678,7 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) else fLck = hb_fileLock( pArea->pDataFile, ulPos + ulRecNo, ulRlSize, FL_UNLOCK ); if( !fLck ) - uiErr = FAILURE; + uiErr = HB_FAILURE; } break; @@ -4695,7 +4695,7 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) hb_releaseCPU(); } if( !fLck ) - uiErr = FAILURE; + uiErr = HB_FAILURE; else pArea->fHeaderLocked = TRUE; } @@ -4706,7 +4706,7 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) if( pArea->fHeaderLocked ) { if( !hb_fileLock( pArea->pDataFile, ulPos, 1, FL_UNLOCK ) ) - uiErr = FAILURE; + uiErr = HB_FAILURE; pArea->fHeaderLocked = FALSE; } break; @@ -4718,7 +4718,7 @@ static ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG ulRecNo ) /* * Perform a network lock in the specified WorkArea. */ -static ERRCODE hb_dbfLock( DBFAREAP pArea, LPDBLOCKINFO pLockInfo ) +static HB_ERRCODE hb_dbfLock( DBFAREAP pArea, LPDBLOCKINFO pLockInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfLock(%p, %p)", pArea, pLockInfo)); @@ -4743,22 +4743,22 @@ static ERRCODE hb_dbfLock( DBFAREAP pArea, LPDBLOCKINFO pLockInfo ) else pLockInfo->fResult = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* * Release network locks in the specified WorkArea. */ -static ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo ) +static HB_ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo ) { - ERRCODE uiError; + HB_ERRCODE uiError; ULONG ulRecNo; HB_TRACE(HB_TR_DEBUG, ("dbfUnLock(%p, %p)", pArea, pRecNo)); ulRecNo = hb_itemGetNL( pRecNo ); - uiError = SUCCESS; + uiError = HB_SUCCESS; if( pArea->fShared ) { if( pArea->ulNumLocksPos > 0 ) @@ -4780,7 +4780,7 @@ static ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo ) /* * Create a memo file in the WorkArea. */ -static ERRCODE hb_dbfCreateMemFile( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) +static HB_ERRCODE hb_dbfCreateMemFile( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) { PHB_ITEM pError; @@ -4797,31 +4797,31 @@ static ERRCODE hb_dbfCreateMemFile( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) hb_itemRelease( pError ); } pArea->fHasMemo = FALSE; - return FAILURE; + return HB_FAILURE; } /* * BLOB2FILE - retrieve memo contents into file */ -static ERRCODE hb_dbfGetValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) +static HB_ERRCODE hb_dbfGetValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) { - USHORT uiError = SUCCESS; + USHORT uiError = HB_SUCCESS; LPFIELD pField; HB_TRACE(HB_TR_DEBUG, ("hb_dbfGetValueFile(%p, %hu, %s, %hu)", pArea, uiIndex, szFile, uiMode)); if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; if( --uiIndex >= pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; pField = pArea->lpFields + uiIndex; if( pField->uiType == HB_FT_STRING ) @@ -4853,7 +4853,7 @@ static ERRCODE hb_dbfGetValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile } /* Exit if any error */ - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { PHB_ITEM pError = hb_errNew(); hb_errPutGenCode( pError, hb_dbfGetEGcode( uiError ) ); @@ -4867,15 +4867,15 @@ static ERRCODE hb_dbfGetValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile } SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Open a memo file in the specified WorkArea. */ -static ERRCODE hb_dbfOpenMemFile( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_dbfOpenMemFile( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pError; @@ -4888,15 +4888,15 @@ static ERRCODE hb_dbfOpenMemFile( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) hb_errPutFileName( pError, ( char * ) pOpenInfo->abName ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } /* * FILE2BLOB - store file contents in MEMO */ -static ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) +static HB_ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) { - USHORT uiError = SUCCESS, uiRead; + USHORT uiError = HB_SUCCESS, uiRead; LPFIELD pField; HB_TRACE(HB_TR_DEBUG, ("hb_dbfPutValueFile(%p, %hu, %s, %hu)", pArea, uiIndex, szFile, uiMode)); @@ -4905,23 +4905,23 @@ static ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile if( pArea->lpdbPendingRel ) { - if( SELF_FORCEREL( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_FORCEREL( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* Read record */ if( !pArea->fValidBuffer && !hb_dbfReadRecord( pArea ) ) - return FAILURE; + return HB_FAILURE; if( --uiIndex >= pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; if( !pArea->fPositioned ) - return FAILURE; + return HB_FAILURE; /* Buffer is hot? */ - if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pField = pArea->lpFields + uiIndex; if( pField->uiType == HB_FT_STRING ) @@ -4950,7 +4950,7 @@ static ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile } /* Exit if any error */ - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { PHB_ITEM pError = hb_errNew(); hb_errPutGenCode( pError, hb_dbfGetEGcode( uiError ) ); @@ -4964,15 +4964,15 @@ static ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, BYTE * szFile } SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Read the database file header record in the WorkArea. */ -static ERRCODE hb_dbfReadDBHeader( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfReadDBHeader( DBFAREAP pArea ) { BOOL fRetry, fError; PHB_ITEM pError; @@ -5084,22 +5084,22 @@ static ERRCODE hb_dbfReadDBHeader( DBFAREAP pArea ) /* Read error? */ if( fError ) - return FAILURE; + return HB_FAILURE; pArea->uiHeaderLen = HB_GET_LE_UINT16( pArea->dbfHeader.uiHeaderLen ); pArea->ulRecCount = HB_GET_LE_UINT32( pArea->dbfHeader.ulRecCount ); - return SUCCESS; + return HB_SUCCESS; } /* * Write the database file header record in the WorkArea. */ -static ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea ) +static HB_ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea ) { int iYear, iMonth, iDay; BOOL fLck = FALSE; - ERRCODE errCode; + HB_ERRCODE errCode; PHB_ITEM pError; HB_TRACE(HB_TR_DEBUG, ("hb_dbfWriteDBHeader(%p)", pArea)); @@ -5112,7 +5112,7 @@ static ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea ) hb_errPutSubCode( pError, EDBF_READONLY ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } pArea->dbfHeader.bHasTags = pArea->fHasTags ? 0x01 : 0x00; @@ -5148,8 +5148,8 @@ static ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea ) { if( !pArea->fHeaderLocked ) { - if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_LOCK, 0 ) != SUCCESS ) - return FAILURE; + if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_LOCK, 0 ) != HB_SUCCESS ) + return HB_FAILURE; fLck = TRUE; } pArea->ulRecCount = hb_dbfCalcRecCount( pArea ); @@ -5171,22 +5171,22 @@ static ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea ) if( hb_fileWriteAt( pArea->pDataFile, ( BYTE * ) &pArea->dbfHeader, sizeof( DBFHEADER ), 0 ) == sizeof( DBFHEADER ) ) { - errCode = SUCCESS; + errCode = HB_SUCCESS; } else { - errCode = FAILURE; + errCode = HB_FAILURE; } /* TODO: add RT error */ pArea->fDataFlush = TRUE; pArea->fUpdateHeader = FALSE; if( fLck ) { - if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_UNLOCK, 0 ) != SUCCESS ) - return FAILURE; + if( SELF_RAWLOCK( ( AREAP ) pArea, HEADER_UNLOCK, 0 ) != HB_SUCCESS ) + return HB_FAILURE; } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { pError = hb_errNew(); @@ -5201,7 +5201,7 @@ static ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea ) return errCode; } -static ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ) +static HB_ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ) { char szFileName[ _POSIX_PATH_MAX + 1 ], * szFile, * szExt; PHB_ITEM pFileExt = NULL; @@ -5226,7 +5226,7 @@ static ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIn { /* Add default extension if missing */ pFileExt = hb_itemPutC( NULL, NULL ); - if( SELF_RDDINFO( pRDD, fTable ? RDDI_TABLEEXT : RDDI_ORDBAGEXT, ulConnect, pFileExt ) == SUCCESS ) + if( SELF_RDDINFO( pRDD, fTable ? RDDI_TABLEEXT : RDDI_ORDBAGEXT, ulConnect, pFileExt ) == HB_SUCCESS ) pFileName->szExtension = hb_itemGetCPtr( pFileExt ); } hb_fsFNameMerge( szFileName, pFileName ); @@ -5247,7 +5247,7 @@ static ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIn */ pFileName = hb_fsFNameSplit( szFileName ); pFileExt = hb_itemPutC( pFileExt, NULL ); - if( SELF_RDDINFO( pRDD, RDDI_MEMOEXT, ulConnect, pFileExt ) == SUCCESS ) + if( SELF_RDDINFO( pRDD, RDDI_MEMOEXT, ulConnect, pFileExt ) == HB_SUCCESS ) { szExt = hb_itemGetCPtr( pFileExt ); if( szExt[ 0 ] ) @@ -5262,7 +5262,7 @@ static ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIn * in the same directory as table file */ pFileExt = hb_itemPutC( pFileExt, NULL ); - if( SELF_RDDINFO( pRDD, RDDI_ORDSTRUCTEXT, ulConnect, pFileExt ) == SUCCESS ) + if( SELF_RDDINFO( pRDD, RDDI_ORDSTRUCTEXT, ulConnect, pFileExt ) == HB_SUCCESS ) { szExt = hb_itemGetCPtr( pFileExt ); if( szExt[ 0 ] ) @@ -5280,10 +5280,10 @@ static ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIn hb_itemRelease( pFileExt ); } - return fResult ? SUCCESS : FAILURE; + return fResult ? HB_SUCCESS : HB_FAILURE; } -static ERRCODE hb_dbfExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ) +static HB_ERRCODE hb_dbfExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ) { char szFileName[ _POSIX_PATH_MAX + 1 ], * szFile; PHB_ITEM pFileExt = NULL; @@ -5306,7 +5306,7 @@ static ERRCODE hb_dbfExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItem if( ! pFileName->szExtension && hb_setGetDefExtension() ) { pFileExt = hb_itemPutC( NULL, NULL ); - if( SELF_RDDINFO( pRDD, fTable ? RDDI_TABLEEXT : RDDI_ORDBAGEXT, ulConnect, pFileExt ) == SUCCESS ) + if( SELF_RDDINFO( pRDD, fTable ? RDDI_TABLEEXT : RDDI_ORDBAGEXT, ulConnect, pFileExt ) == HB_SUCCESS ) pFileName->szExtension = hb_itemGetCPtr( pFileExt ); } hb_fsFNameMerge( szFileName, pFileName ); @@ -5316,7 +5316,7 @@ static ERRCODE hb_dbfExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItem hb_itemRelease( pFileExt ); } - return hb_spFile( ( BYTE * ) szFileName, NULL ) ? SUCCESS : FAILURE; + return hb_spFile( ( BYTE * ) szFileName, NULL ) ? HB_SUCCESS : HB_FAILURE; } static void hb_dbfInitTSD( void * Cargo ) @@ -5346,7 +5346,7 @@ static void hb_dbfDestroyTSD( void * Cargo ) hb_xfree( pData->szPendingPasswd ); } -static ERRCODE hb_dbfInit( LPRDDNODE pRDD ) +static HB_ERRCODE hb_dbfInit( LPRDDNODE pRDD ) { PHB_TSD pTSD; @@ -5356,10 +5356,10 @@ static ERRCODE hb_dbfInit( LPRDDNODE pRDD ) HB_TSD_INIT( pTSD, sizeof( DBFDATA ), hb_dbfInitTSD, hb_dbfDestroyTSD ); pRDD->lpvCargo = ( void * ) pTSD; - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_dbfExit( LPRDDNODE pRDD ) +static HB_ERRCODE hb_dbfExit( LPRDDNODE pRDD ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfExit(%p)", pRDD)); @@ -5371,10 +5371,10 @@ static ERRCODE hb_dbfExit( LPRDDNODE pRDD ) } s_uiRddId = ( USHORT ) -1; - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +static HB_ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { LPDBFDATA pData; @@ -5467,7 +5467,7 @@ static ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P hb_itemPutC( pItem, szTrigger ); if( !szTrigger && !fFree ) - return FAILURE; + return HB_FAILURE; break; } @@ -5488,7 +5488,7 @@ static ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P pData->szPendingTrigger = NULL; } else - return FAILURE; + return HB_FAILURE; break; case RDDI_PASSWORD: @@ -5509,7 +5509,7 @@ static ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P hb_itemPutC( pItem, szPasswd ); if( !szPasswd && !fFree ) - return FAILURE; + return HB_FAILURE; break; } @@ -5530,7 +5530,7 @@ static ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P pData->szPendingPasswd = NULL; } else - return FAILURE; + return HB_FAILURE; break; default: @@ -5538,7 +5538,7 @@ static ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P } - return SUCCESS; + return HB_SUCCESS; } @@ -5557,13 +5557,13 @@ HB_FUNC( DBF_GETFUNCTABLE ) if( pTable ) { - ERRCODE errCode; + HB_ERRCODE errCode; if( uiCount ) * uiCount = RDDFUNCSCOUNT; errCode = hb_rddInherit( pTable, &dbfTable, &dbfSuper, NULL ); hb_retni( errCode ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { /* * we successfully register our RDD so now we can initialize it @@ -5573,7 +5573,7 @@ HB_FUNC( DBF_GETFUNCTABLE ) } } else - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index d734bc75d5..549c9aa53d 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -346,12 +346,12 @@ static void hb_cdxErrInternal( const char * szMsg ) /* * generate Run-Time error */ -static ERRCODE hb_cdxErrorRT( CDXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, +static HB_ERRCODE hb_cdxErrorRT( CDXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, const char * filename, USHORT uiOsCode, USHORT uiFlags, PHB_ITEM * pErrorPtr ) { PHB_ITEM pError; - ERRCODE iRet = FAILURE; + HB_ERRCODE iRet = HB_FAILURE; if( hb_vmRequestQuery() == 0 ) { @@ -749,7 +749,7 @@ static LPCDXKEY hb_cdxKeyEval( LPCDXKEY pKey, LPCDXTAG pTag ) pKey = hb_cdxKeyPutItem( pKey, pItem, pArea->ulRecNo, pTag, FALSE, TRUE ); hb_itemRelease( pItem ); } - else + else { int iCurrArea = hb_rddGetCurrentWorkAreaNumber(); @@ -984,13 +984,13 @@ static void hb_cdxTagRefreshScope( LPCDXTAG pTag ) if ( hb_itemType( pTag->topScope ) == HB_IT_BLOCK ) { pItem = hb_vmEvalBlock( pTag->topScope ); - pTag->topScopeKey = hb_cdxKeyPutItem( pTag->topScopeKey, pItem, + pTag->topScopeKey = hb_cdxKeyPutItem( pTag->topScopeKey, pItem, pTag->topScopeKey->rec, pTag, TRUE, FALSE ); } if ( hb_itemType( pTag->bottomScope ) == HB_IT_BLOCK ) { pItem = hb_vmEvalBlock( pTag->bottomScope ); - pTag->bottomScopeKey = hb_cdxKeyPutItem( pTag->bottomScopeKey, pItem, + pTag->bottomScopeKey = hb_cdxKeyPutItem( pTag->bottomScopeKey, pItem, pTag->bottomScopeKey->rec, pTag, TRUE, FALSE ); } } @@ -3575,7 +3575,7 @@ static void hb_cdxTagLoad( LPCDXTAG pTag ) if( pTag->OptFlags & CDX_TYPE_STRUCTURE ) return; - if( !*pTag->KeyExpr || SELF_COMPILE( ( AREAP ) pTag->pIndex->pArea, ( BYTE * ) pTag->KeyExpr ) == FAILURE ) + if( !*pTag->KeyExpr || SELF_COMPILE( ( AREAP ) pTag->pIndex->pArea, ( BYTE * ) pTag->KeyExpr ) == HB_FAILURE ) { pTag->RootBlock = 0; /* To force RT error - index corrupted */ return; @@ -3601,7 +3601,7 @@ static void hb_cdxTagLoad( LPCDXTAG pTag ) pTag->ForExpr = ( char * ) hb_xgrab( uiForLen + 1 ); hb_strncpyTrim( pTag->ForExpr, ( const char * ) tagHeader.keyExpPool + uiForPos, uiForLen ); - if ( SELF_COMPILE( ( AREAP ) pTag->pIndex->pArea, ( BYTE * ) pTag->ForExpr ) == FAILURE ) + if ( SELF_COMPILE( ( AREAP ) pTag->pIndex->pArea, ( BYTE * ) pTag->ForExpr ) == HB_FAILURE ) pTag->RootBlock = 0; /* To force RT error - index corrupted */ else { @@ -3906,7 +3906,7 @@ static BOOL hb_cdxCheckRecordScope( CDXAREAP pArea, ULONG ulRec ) { LONG lRecNo = ( LONG ) ulRec; - if ( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == SUCCESS && lRecNo == 0 ) + if ( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == HB_SUCCESS && lRecNo == 0 ) { return FALSE; } @@ -4909,7 +4909,7 @@ static void hb_cdxCreateFName( CDXAREAP pArea, char * szBagName, BOOL * fProd, DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); pExt = pExtInfo.itmResult = hb_itemPutC( NULL, NULL ); - if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == SUCCESS && + if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS && hb_itemGetCLen( pExt ) > 0 ) { pFileName->szExtension = hb_itemGetCPtr( pExt ); @@ -4934,7 +4934,7 @@ static void hb_cdxCreateFName( CDXAREAP pArea, char * szBagName, BOOL * fProd, DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); pExt = pExtInfo.itmResult = hb_itemPutC( NULL, NULL ); - if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == SUCCESS ) + if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS ) { *fProd = hb_stricmp( pFileName->szExtension, hb_itemGetCPtr( pExt ) ) == 0; @@ -4974,7 +4974,7 @@ static void hb_cdxOrdListClear( CDXAREAP pArea, BOOL fAll, LPCDXINDEX pKeepInd ) memset( &pExtInfo, 0, sizeof( pExtInfo ) ); pExt = pExtInfo.itmResult = hb_itemPutC( NULL, NULL ); - if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == SUCCESS ) + if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS ) { fAll = hb_stricmp( pFileNameCdx->szExtension, hb_itemGetCPtr( pExt ) ) != 0; @@ -5233,14 +5233,14 @@ static BOOL hb_cdxCurKeyRefresh( CDXAREAP pArea, LPCDXTAG pTag ) /* * skip to next/previous unique key */ -static ERRCODE hb_cdxDBOISkipUnique( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward ) +static HB_ERRCODE hb_cdxDBOISkipUnique( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward ) { - ERRCODE retval; + HB_ERRCODE retval; HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipUnique(%p, %p, %i)", pArea, pTag, fForward)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if ( ! pTag ) return SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ); @@ -5355,12 +5355,12 @@ static BOOL hb_cdxDBOISkipEval( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipEval(%p, %p, %i, %p)", pArea, pTag, fForward, pEval)); - if( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) + if( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return FALSE; if( ! pTag || hb_itemType( pEval ) != HB_IT_BLOCK ) { - if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) == FAILURE ) + if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) == HB_FAILURE ) return FALSE; return fForward ? !pArea->fEof : !pArea->fBof; } @@ -5385,7 +5385,7 @@ static BOOL hb_cdxDBOISkipEval( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, hb_cdxTagSkipNext( pTag ); while ( !pTag->TagEOF ) { - if ( SELF_GOTO( ( AREAP ) pArea, pTag->CurKey->rec ) == FAILURE ) + if ( SELF_GOTO( ( AREAP ) pArea, pTag->CurKey->rec ) == HB_FAILURE ) break; if ( hb_cdxEvalSeekCond( pTag, pEval ) ) { @@ -5408,7 +5408,7 @@ static BOOL hb_cdxDBOISkipEval( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, hb_cdxTagSkipPrev( pTag ); while ( !pTag->TagBOF ) { - if ( SELF_GOTO( ( AREAP ) pArea, pTag->CurKey->rec ) == FAILURE ) + if ( SELF_GOTO( ( AREAP ) pArea, pTag->CurKey->rec ) == HB_FAILURE ) break; if ( hb_cdxEvalSeekCond( pTag, pEval ) ) { @@ -5451,14 +5451,14 @@ static BOOL hb_cdxDBOISkipWild( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipWild(%p, %p, %i, %p)", pArea, pTag, fForward, pWildItm)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return FALSE; szPattern = hb_itemGetCPtr( pWildItm ); if ( ! pTag || pTag->uiType != 'C' || !szPattern || !*szPattern ) { - if ( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) == FAILURE ) + if ( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) == HB_FAILURE ) return FALSE; return fForward ? pArea->fPositioned : !pArea->fBof; } @@ -5501,7 +5501,7 @@ static BOOL hb_cdxDBOISkipWild( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, { LPCDXKEY pKey; - pKey = hb_cdxKeyPut( NULL, ( BYTE * ) szPattern, iFixed, + pKey = hb_cdxKeyPut( NULL, ( BYTE * ) szPattern, iFixed, pTag->UsrAscend ? CDX_IGNORE_REC_NUM : CDX_MAX_REC_NUM ); if( !hb_cdxTagKeyFind( pTag, pKey ) ) { @@ -5523,7 +5523,7 @@ static BOOL hb_cdxDBOISkipWild( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, if ( hb_strMatchWild( (const char *) pTag->CurKey->val, szPattern ) ) { ULONG ulRecNo = pTag->CurKey->rec; - if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != HB_SUCCESS ) break; SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); if ( pArea->ulRecNo == ulRecNo || @@ -5552,7 +5552,7 @@ static BOOL hb_cdxDBOISkipWild( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, if ( hb_strMatchWild( (const char *) pTag->CurKey->val, szPattern ) ) { ULONG ulRecNo = pTag->CurKey->rec; - if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != HB_SUCCESS ) break; SELF_SKIPFILTER( ( AREAP ) pArea, -1 ); if ( pArea->ulRecNo == ulRecNo || @@ -5618,12 +5618,12 @@ static BOOL hb_cdxDBOISkipRegEx( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipRegEx(%p, %p, %i, %p)", pArea, pTag, fForward, pRegExItm)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return FALSE; if( !pTag || pTag->uiType != 'C' || ( pRegEx = hb_regexGet( pRegExItm, 0 ) ) == NULL ) { - if ( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) == FAILURE ) + if ( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) == HB_FAILURE ) return FALSE; return fForward ? pArea->fPositioned : !pArea->fBof; } @@ -5835,12 +5835,12 @@ static LONG hb_cdxDBOIKeyCount( CDXAREAP pArea, LPCDXTAG pTag, BOOL fFilters ) { ULONG ulRecNo = pArea->ulRecNo; - if ( SELF_GOTOP( ( AREAP ) pArea ) == SUCCESS ) + if ( SELF_GOTOP( ( AREAP ) pArea ) == HB_SUCCESS ) { while ( !pArea->fEof ) { ulKeyCount++; - if ( SELF_SKIP( ( AREAP ) pArea, 1 ) != SUCCESS ) + if ( SELF_SKIP( ( AREAP ) pArea, 1 ) != HB_SUCCESS ) break; } SELF_GOTO( ( AREAP ) pArea, ulRecNo ); @@ -5875,8 +5875,8 @@ static LONG hb_cdxDBOIKeyNo( CDXAREAP pArea, LPCDXTAG pTag, BOOL fFilters ) hb_cdxIndexLockRead( pTag->pIndex ); hb_cdxTagRefreshScope( pTag ); - if ( fFilters ? ( fLogOpt && CURKEY_LOGPOS( pTag ) ) : - ( CURKEY_RAWPOS( pTag ) && + if ( fFilters ? ( fLogOpt && CURKEY_LOGPOS( pTag ) ) : + ( CURKEY_RAWPOS( pTag ) && pTag->rawKeyRec == pArea->ulRecNo ) ) { ulKeyNo = fFilters ? pTag->logKeyPos : pTag->rawKeyPos; @@ -5975,7 +5975,7 @@ static LONG hb_cdxDBOIKeyNo( CDXAREAP pArea, LPCDXTAG pTag, BOOL fFilters ) do { ulKeyNo++; - if ( SELF_SKIP( ( AREAP ) pArea, -1 ) != SUCCESS ) + if ( SELF_SKIP( ( AREAP ) pArea, -1 ) != HB_SUCCESS ) break; } while ( !( ( AREAP ) pArea )->fBof ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); @@ -5992,9 +5992,9 @@ static LONG hb_cdxDBOIKeyNo( CDXAREAP pArea, LPCDXTAG pTag, BOOL fFilters ) /* * DBOI_KEYGOTO goto specific logical record in the index file */ -static ERRCODE hb_cdxDBOIKeyGoto( CDXAREAP pArea, LPCDXTAG pTag, ULONG ulKeyNo, BOOL fFilters ) +static HB_ERRCODE hb_cdxDBOIKeyGoto( CDXAREAP pArea, LPCDXTAG pTag, ULONG ulKeyNo, BOOL fFilters ) { - ERRCODE retval; + HB_ERRCODE retval; ULONG ulKeyCnt = ulKeyNo; BOOL fLogOpt = pArea->dbfi.itmCobExpr || !pArea->dbfi.fFilter; @@ -6082,7 +6082,7 @@ static ERRCODE hb_cdxDBOIKeyGoto( CDXAREAP pArea, LPCDXTAG pTag, ULONG ulKeyNo, if ( fLogOpt && fFilters && pArea->dbfi.itmCobExpr ) { retval = SELF_GOTOP( ( AREAP ) pArea ); - if( retval == SUCCESS && --ulKeyCnt ) + if( retval == HB_SUCCESS && --ulKeyCnt ) retval = SELF_SKIP( ( AREAP ) pArea, ulKeyCnt ); } else @@ -6437,15 +6437,15 @@ static void hb_cdxClearLogPosInfo( CDXAREAP pArea ) /* ( DBENTRYP_BP ) hb_cdxFound : NULL */ /* ( DBENTRYP_V ) hb_cdxGoBottom */ -static ERRCODE hb_cdxGoBottom( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxGoBottom( CDXAREAP pArea ) { LPCDXTAG pTag; - ERRCODE retval; + HB_ERRCODE retval; HB_TRACE(HB_TR_DEBUG, ("hb_cdxGoBottom(%p)", pArea)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pTag = hb_cdxGetActiveTag( pArea ); if ( ! pTag ) @@ -6464,7 +6464,7 @@ static ERRCODE hb_cdxGoBottom( CDXAREAP pArea ) retval = SELF_GOTO( ( AREAP ) pArea, pTag->CurKey->rec ); - if ( retval != FAILURE && pArea->fPositioned ) + if ( retval != HB_FAILURE && pArea->fPositioned ) { retval = SELF_SKIPFILTER( ( AREAP ) pArea, -1 ); @@ -6483,15 +6483,15 @@ static ERRCODE hb_cdxGoBottom( CDXAREAP pArea ) /* ( DBENTRYP_I ) hb_cdxGoToId : NULL */ /* ( DBENTRYP_V ) hb_cdxGoTop */ -static ERRCODE hb_cdxGoTop( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxGoTop( CDXAREAP pArea ) { LPCDXTAG pTag; - ERRCODE retval; + HB_ERRCODE retval; HB_TRACE(HB_TR_DEBUG, ("hb_cdxGoTop(%p)", pArea)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pTag = hb_cdxGetActiveTag( pArea ); if ( ! pTag ) @@ -6510,10 +6510,10 @@ static ERRCODE hb_cdxGoTop( CDXAREAP pArea ) retval = SELF_GOTO( ( AREAP ) pArea, pTag->CurKey->rec ); - if ( retval != FAILURE && pArea->fPositioned ) + if ( retval != HB_FAILURE && pArea->fPositioned ) retval = SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); - if ( retval != FAILURE && pArea->fPositioned ) + if ( retval != HB_FAILURE && pArea->fPositioned ) { pTag->logKeyPos = 1; CURKEY_SETLOGPOS( pTag ); @@ -6524,26 +6524,26 @@ static ERRCODE hb_cdxGoTop( CDXAREAP pArea ) } /* ( DBENTRYP_BIB ) hb_cdxSeek */ -static ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pKeyItm, BOOL fFindLast ) +static HB_ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pKeyItm, BOOL fFindLast ) { LPCDXTAG pTag; HB_TRACE(HB_TR_DEBUG, ("hb_cdxSeek(%p, %d, %p, %d)", pArea, fSoftSeek, pKeyItm, fFindLast)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pTag = hb_cdxGetActiveTag( pArea ); if ( ! pTag ) { hb_cdxErrorRT( pArea, EG_NOORDER, EDBF_NOTINDEXED, NULL, 0, EF_CANDEFAULT, NULL ); - return FAILURE; + return HB_FAILURE; } else { LPCDXKEY pKey; - ERRCODE retval = SUCCESS; + HB_ERRCODE retval = HB_SUCCESS; BOOL fEOF = FALSE, fLast; ULONG ulRec; @@ -6581,10 +6581,10 @@ static ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pKeyItm, BOO if ( !fEOF ) { retval = SELF_GOTO( ( AREAP ) pArea, pTag->CurKey->rec ); - if ( retval != FAILURE && pArea->fPositioned ) + if ( retval != HB_FAILURE && pArea->fPositioned ) { retval = SELF_SKIPFILTER( ( AREAP ) pArea, fFindLast ? -1 : 1 ); - if ( retval != FAILURE && ulRec && pArea->fPositioned ) + if ( retval != HB_FAILURE && ulRec && pArea->fPositioned ) { pArea->fFound = ( ulRec == pArea->ulRecNo || hb_cdxValCompare( pTag, pKey->val, pKey->len, @@ -6594,7 +6594,7 @@ static ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pKeyItm, BOO } } } - if ( retval != FAILURE && + if ( retval != HB_FAILURE && ( fEOF || ! hb_cdxTopScope( pTag ) || ! hb_cdxBottomScope( pTag ) ) ) { @@ -6607,7 +6607,7 @@ static ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pKeyItm, BOO } /* ( DBENTRYP_L ) hb_cdxSkip : NULL */ -static ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) { LPCDXTAG pTag; ULONG ulPos, ulRec; @@ -6628,8 +6628,8 @@ static ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) ulPos = ulRec = 0; } - if ( SUPER_SKIP( ( AREAP ) pArea, lToSkip ) == FAILURE ) - return FAILURE; + if ( SUPER_SKIP( ( AREAP ) pArea, lToSkip ) == HB_FAILURE ) + return HB_FAILURE; if ( pTag ) { @@ -6669,22 +6669,22 @@ static ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) pTag->logKeyRec = pArea->ulRecNo; } } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_L ) hb_cdxSkipFilter : NULL */ /* ( DBENTRYP_L ) hb_cdxSkipRaw */ -static ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip ) { LPCDXTAG pTag; - ERRCODE retval; + HB_ERRCODE retval; BOOL fOut = FALSE, fForward; HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipRaw(%p, %ld)", pArea, lToSkip)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pTag = hb_cdxGetActiveTag( pArea ); @@ -6776,15 +6776,15 @@ static ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip ) /* * Flush _system_ buffers to disk */ -static ERRCODE hb_cdxFlush( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxFlush( CDXAREAP pArea ) { LPCDXINDEX pIndex; - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_cdxFlush(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; uiError = SUPER_FLUSH( ( AREAP ) pArea ); @@ -6813,15 +6813,15 @@ static ERRCODE hb_cdxFlush( CDXAREAP pArea ) /* * Perform a write of WorkArea memory to the data store. */ -static ERRCODE hb_cdxGoCold( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxGoCold( CDXAREAP pArea ) { BOOL fRecordChanged = pArea->fRecordChanged; BOOL fAppend = pArea->fAppend; HB_TRACE(HB_TR_DEBUG, ("hb_cdxGoCold(%p)", pArea)); - if ( SUPER_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( SUPER_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if ( ( fRecordChanged || pArea->fCdxAppend ) && pArea->lpIndexes ) { @@ -6837,7 +6837,7 @@ static ERRCODE hb_cdxGoCold( CDXAREAP pArea ) if ( pArea->fCdxAppend ) hb_cdxErrInternal( "hb_cdxGoCold: multiple appending without GOCOLD." ); pArea->fCdxAppend = TRUE; - return SUCCESS; + return HB_SUCCESS; } else { @@ -6931,14 +6931,14 @@ static ERRCODE hb_cdxGoCold( CDXAREAP pArea ) pArea->lpdbPendingRel = lpdbPendingRel; } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_V ) hb_cdxGoHot */ /* * Mark the WorkArea data buffer as hot. */ -static ERRCODE hb_cdxGoHot( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxGoHot( CDXAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_cdxGoHot(%p)", pArea)); @@ -6946,8 +6946,8 @@ static ERRCODE hb_cdxGoHot( CDXAREAP pArea ) if ( pArea->fRecordChanged ) hb_cdxErrInternal( "hb_cdxGoHot: multiple marking buffer as hot." ); - if ( SUPER_GOHOT( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( SUPER_GOHOT( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if ( pArea->lpIndexes && !pArea->fCdxAppend ) { @@ -6971,7 +6971,7 @@ static ERRCODE hb_cdxGoHot( CDXAREAP pArea ) } } } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_P ) hb_cdxPutRec : NULL */ @@ -6988,18 +6988,18 @@ static ERRCODE hb_cdxGoHot( CDXAREAP pArea ) /* * Close the table in the WorkArea. */ -static ERRCODE hb_cdxClose( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxClose( CDXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_cdxClose(%p)", pArea)); - if ( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; errCode = SUPER_CLOSE( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if ( pArea->pSort ) { @@ -7048,19 +7048,19 @@ static ERRCODE hb_cdxClose( CDXAREAP pArea ) /* * Open a data store in the WorkArea. */ -static ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; HB_TRACE(HB_TR_DEBUG, ("hb_cdxOpen(%p, %p)", pArea, pOpenInfo)); if ( !pArea->bLockType ) { PHB_ITEM pItem = hb_itemNew( NULL ); - if( SELF_INFO( ( AREAP ) pArea, DBI_LOCKSCHEME, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_LOCKSCHEME, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); - return FAILURE; + return HB_FAILURE; } pArea->bLockType = hb_itemGetNI( pItem ); hb_itemRelease( pItem ); @@ -7069,9 +7069,9 @@ static ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo ) pArea->bLockType = DB_DBFLOCK_VFP; } } - if ( SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ) == FAILURE ) + if ( SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ) == HB_FAILURE ) { - return FAILURE; + return HB_FAILURE; } /* open (production) structural index */ @@ -7091,12 +7091,12 @@ static ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo ) pOrderInfo.itmNewVal = NULL; pOrderInfo.itmOrder = NULL; errCode = SELF_ORDLSTADD( ( AREAP ) pArea, &pOrderInfo ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pOrderInfo.itmOrder = hb_itemPutNI( NULL, hb_setGetAutOrder() ); errCode = SELF_ORDLSTFOCUS( ( AREAP ) pArea, &pOrderInfo ); hb_itemRelease( pOrderInfo.itmOrder ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_GOTOP( ( AREAP ) pArea ); } hb_itemRelease( pOrderInfo.atomBagName ); @@ -7117,13 +7117,13 @@ static ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo ) /* * Retrieve the size of the WorkArea structure. */ -static ERRCODE hb_cdxStructSize( CDXAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_cdxStructSize( CDXAREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("hb_cdxStrucSize(%p, %p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( CDXAREA ); - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_P ) hb_cdxSysName : NULL */ @@ -7131,19 +7131,19 @@ static ERRCODE hb_cdxStructSize( CDXAREAP pArea, USHORT * uiSize ) /* ( DBENTRYP_VEI ) hb_cdxEval : NULL */ /* ( DBENTRYP_V ) hb_cdxPack */ -static ERRCODE hb_cdxPack( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxPack( CDXAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_cdxPack(%p)", pArea )); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; - if ( SUPER_PACK( ( AREAP ) pArea ) == SUCCESS ) + if ( SUPER_PACK( ( AREAP ) pArea ) == HB_SUCCESS ) { return SELF_ORDLSTREBUILD( ( AREAP ) pArea ); } else - return FAILURE; + return HB_FAILURE; } /* ( DBENTRYP_LSP ) hb_cdxPackRec : NULL */ @@ -7152,19 +7152,19 @@ static ERRCODE hb_cdxPack( CDXAREAP pArea ) /* ( DBENTRYP_VT ) hb_cdxTransRec : NULL */ /* ( DBENTRYP_V ) hb_cdxZap */ -static ERRCODE hb_cdxZap ( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxZap ( CDXAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("nb_cdxZap(%p)", pArea )); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; - if ( SUPER_ZAP( ( AREAP ) pArea ) == SUCCESS ) + if ( SUPER_ZAP( ( AREAP ) pArea ) == HB_SUCCESS ) { return SELF_ORDLSTREBUILD( ( AREAP ) pArea ); } else - return FAILURE; + return HB_FAILURE; } /* ( DBENTRYP_VR ) hb_cdxChildEnd : NULL */ @@ -7179,7 +7179,7 @@ static ERRCODE hb_cdxZap ( CDXAREAP pArea ) /* ( DBENTRYP_VR ) hb_cdxSetRel : NULL */ /* ( DBENTRYP_OI ) hb_cdxOrderListAdd */ -static ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) { USHORT uiFlags; PHB_FILE pFile; @@ -7191,18 +7191,18 @@ static ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) HB_TRACE(HB_TR_DEBUG, ("hb_cdxOrderListAdd(%p, %p)", pArea, pOrderInfo)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if ( hb_itemGetCLen( pOrderInfo->atomBagName ) == 0 ) - return FAILURE; + return HB_FAILURE; hb_cdxCreateFName( pArea, hb_itemGetCPtr( pOrderInfo->atomBagName ), &fProd, szFileName, szBaseName ); /* if ( ! szBaseName[0] ) - return FAILURE; + return HB_FAILURE; */ pIndex = hb_cdxFindBag( pArea, szFileName ); @@ -7214,7 +7214,7 @@ static ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) pArea->uiTag = hb_cdxGetTagNumber( pArea, pIndex->TagList ); SELF_GOTOP( ( AREAP ) pArea ); } - return SUCCESS; + return HB_SUCCESS; } uiFlags = ( pArea->fReadonly ? FO_READ : FO_READWRITE ) | @@ -7247,7 +7247,7 @@ static ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) if( !pFile ) { - return FAILURE; + return HB_FAILURE; } pIndex = hb_cdxIndexNew( pArea ); @@ -7268,7 +7268,7 @@ static ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) hb_cdxIndexFree( pIndex ); hb_cdxErrorRT( pArea, EG_CORRUPTION, EDBF_CORRUPT, szFileName, hb_fsError(), EF_CANDEFAULT, NULL ); - return FAILURE; + return HB_FAILURE; } if( fProd ) @@ -7283,29 +7283,29 @@ static ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) pArea->uiTag = hb_cdxGetTagNumber( pArea, pIndex->TagList ); SELF_GOTOP( ( AREAP ) pArea ); } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_V ) hb_cdxOrderListClear */ /* * Clear the current order list. */ -static ERRCODE hb_cdxOrderListClear( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxOrderListClear( CDXAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_cdxOrderListClear(%p)", pArea)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; hb_cdxOrdListClear( pArea, !( DBFAREA_DATA( pArea )->fStrictStruct ? pArea->fHasTags : hb_setGetAutOpen() ), NULL ); pArea->uiTag = 0; - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_OI ) hb_cdxOrderListDelete */ -static ERRCODE hb_cdxOrderListDelete( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_cdxOrderListDelete( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) { char szTagName[ CDX_MAXTAGNAMELEN + 1 ]; char szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -7314,8 +7314,8 @@ static ERRCODE hb_cdxOrderListDelete( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) HB_TRACE(HB_TR_DEBUG, ("hb_cdxOrderListDelete(%p, %p)", pArea, pOrderInfo)); - if( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; hb_cdxCreateFName( pArea, hb_itemGetCPtr( pOrderInfo->atomBagName ), &fProd, szFileName, szTagName ); @@ -7343,21 +7343,21 @@ static ERRCODE hb_cdxOrderListDelete( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) pIndexPtr = &(*pIndexPtr)->pNext; } } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_OI ) hb_cdxOrderListFocus */ -static ERRCODE hb_cdxOrderListFocus( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_cdxOrderListFocus( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) { LPCDXTAG pTag; HB_TRACE(HB_TR_DEBUG, ("hb_cdxOrderListFocus(%p, %p)", pArea, pOrderInfo)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if ( ! pArea->lpIndexes ) - return SUCCESS; + return HB_SUCCESS; pTag = hb_cdxGetActiveTag( pArea ); if ( pTag ) @@ -7369,33 +7369,33 @@ static ERRCODE hb_cdxOrderListFocus( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) /* TODO: RTerror if not found? */ } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_V ) hb_cdxOrderListRebuild */ -static ERRCODE hb_cdxOrderListRebuild( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxOrderListRebuild( CDXAREAP pArea ) { LPCDXINDEX pIndex, * pIndexPtr; USHORT uiPrevTag; HB_TRACE(HB_TR_DEBUG, ("hb_cdxPack(%p)", pArea )); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if ( pArea->fShared ) { hb_cdxErrorRT( pArea, EG_SHARED, EDBF_SHARED, pArea->szDataFileName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if ( pArea->fReadonly ) { hb_cdxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pArea->szDataFileName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if ( ! pArea->lpIndexes ) - return SUCCESS; + return HB_SUCCESS; uiPrevTag = pArea->uiTag; pArea->uiTag = 0; @@ -7425,7 +7425,7 @@ static ERRCODE hb_cdxOrderListRebuild( CDXAREAP pArea ) /* * create new order */ -static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) +static HB_ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) { ULONG ulRecNo; BOOL fNewFile, fOpenedIndex, fProd, fAscend = TRUE, fCustom = FALSE, @@ -7441,8 +7441,8 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo HB_TRACE(HB_TR_DEBUG, ("hb_cdxOrderCreate(%p, %p)", pArea, pOrderInfo)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( pArea->lpdbPendingRel ) SELF_FORCEREL( ( AREAP ) pArea ); @@ -7453,10 +7453,10 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo CDX_HEADEREXPLEN - 2 ) { hb_cdxErrorRT( pArea, EG_DATAWIDTH, EDBF_KEYLENGTH, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } - if( SELF_COMPILE( (AREAP) pArea, ( BYTE * ) hb_itemGetCPtr( pOrderInfo->abExpr ) ) == FAILURE ) + if( SELF_COMPILE( (AREAP) pArea, ( BYTE * ) hb_itemGetCPtr( pOrderInfo->abExpr ) ) == HB_FAILURE ) { if( pOrderInfo->itmCobExpr ) { @@ -7465,7 +7465,7 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo else { hb_cdxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDKEY, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } } else @@ -7483,11 +7483,11 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo /* Get a blank record before testing expression */ ulRecNo = pArea->ulRecNo; SELF_GOTO( ( AREAP ) pArea, 0 ); - if( SELF_EVALBLOCK( ( AREAP ) pArea, pKeyExp ) == FAILURE ) + if( SELF_EVALBLOCK( ( AREAP ) pArea, pKeyExp ) == HB_FAILURE ) { hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); - return FAILURE; + return HB_FAILURE; } pResult = pArea->valResult; pArea->valResult = NULL; @@ -7521,7 +7521,7 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); hb_cdxErrorRT( pArea, bType == 'U' ? EG_DATATYPE : EG_DATAWIDTH, EDBF_INVALIDKEY, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #if defined(HB_COMPAT_C53) && defined(HB_C52_STRICT) else if ( bType == 'C' && uiLen > CDX_MAXKEY ) @@ -7532,7 +7532,7 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo { hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); - return FAILURE; + return HB_FAILURE; } } #endif @@ -7547,12 +7547,12 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo szFor = ( char * ) pArea->lpdbOrdCondInfo->abFor; if( szFor ) { - if( SELF_COMPILE( (AREAP) pArea, ( BYTE * ) szFor ) == FAILURE ) + if( SELF_COMPILE( (AREAP) pArea, ( BYTE * ) szFor ) == HB_FAILURE ) { hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); hb_cdxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDFOR, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } pForExp = pArea->valResult; pArea->valResult = NULL; @@ -7570,12 +7570,12 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo { BOOL fOK; - if ( SELF_EVALBLOCK( ( AREAP ) pArea, pForExp ) == FAILURE ) + if ( SELF_EVALBLOCK( ( AREAP ) pArea, pForExp ) == HB_FAILURE ) { hb_vmDestroyBlockOrMacro( pKeyExp ); hb_vmDestroyBlockOrMacro( pForExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); - return FAILURE; + return HB_FAILURE; } fOK = hb_itemType( pArea->valResult ) == HB_IT_LOGICAL; hb_itemRelease( pArea->valResult ); @@ -7586,7 +7586,7 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo hb_vmDestroyBlockOrMacro( pForExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); hb_cdxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDFOR, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } } @@ -7710,7 +7710,7 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo hb_vmDestroyBlockOrMacro( pKeyExp ); if ( pForExp != NULL ) hb_vmDestroyBlockOrMacro( pForExp ); - return FAILURE; + return HB_FAILURE; } } @@ -7782,7 +7782,7 @@ static ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo } /* ( DBENTRYP_OI ) hb_cdxOrderDestroy */ -static ERRCODE hb_cdxOrderDestroy( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_cdxOrderDestroy( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) { LPCDXINDEX pIndex, pIndexTmp; LPCDXTAG pTag; @@ -7790,11 +7790,11 @@ static ERRCODE hb_cdxOrderDestroy( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) HB_TRACE(HB_TR_DEBUG, ("hb_cdxOrderDestroy(%p, %p)", pArea, pOrderInfo)); - if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if ( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if ( ! pArea->lpIndexes ) - return SUCCESS; + return HB_SUCCESS; if ( pOrderInfo->itmOrder ) { @@ -7848,14 +7848,14 @@ static ERRCODE hb_cdxOrderDestroy( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ) } } } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_OII ) hb_cdxOrderInfo */ /* * Provides information about order management. */ -static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) +static HB_ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) { LPCDXTAG pTag; USHORT uiTag = 0; @@ -7909,27 +7909,27 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI case DBOI_EVALSTEP: pInfo->itmResult = hb_itemPutNL( pInfo->itmResult, pArea->lpdbOrdCondInfo ? pArea->lpdbOrdCondInfo->lStep : 0 ); - return SUCCESS; + return HB_SUCCESS; case DBOI_KEYSINCLUDED: pInfo->itmResult = hb_itemPutNL( pInfo->itmResult, pArea->pSort ? pArea->pSort->ulTotKeys : 0 ); - return SUCCESS; + return HB_SUCCESS; case DBOI_I_TAGNAME: pInfo->itmResult = hb_itemPutC( pInfo->itmResult, pArea->pSort ? pArea->pSort->pTag->szName : NULL ); - return SUCCESS; + return HB_SUCCESS; case DBOI_I_BAGNAME: pInfo->itmResult = hb_itemPutC( pInfo->itmResult, pArea->pSort ? pArea->pSort->pTag->pIndex->szFileName : NULL ); - return SUCCESS; + return HB_SUCCESS; case DBOI_ISREINDEX: pInfo->itmResult = hb_itemPutL( pInfo->itmResult, pArea->pSort ? pArea->pSort->fReindex : FALSE ); - return SUCCESS; + return HB_SUCCESS; case DBOI_LOCKOFFSET: case DBOI_HPLOCKING: @@ -7941,7 +7941,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI pInfo->itmResult = hb_itemPutNInt( pInfo->itmResult, ulPos ); else pInfo->itmResult = hb_itemPutL( pInfo->itmResult, ulPool > 0 ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_ORDERCOUNT: @@ -7961,7 +7961,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI pIndex = pszBag ? NULL : pIndex->pNext; } pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, uiTag ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGCOUNT: @@ -7973,7 +7973,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI pIndex = pIndex->pNext; } pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, uiTag ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGNUMBER: @@ -8002,7 +8002,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI } pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, pIndex ? uiTag : 0 ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGORDER: @@ -8037,12 +8037,12 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI } pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, pIndex ? uiTag : 0 ); - return SUCCESS; + return HB_SUCCESS; } } - if( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( FAST_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( pInfo->itmOrder ) { @@ -8074,11 +8074,11 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI { char * pForExpr = hb_itemGetCPtr( pInfo->itmNewVal ); - if ( SELF_COMPILE( ( AREAP ) pArea, ( BYTE *) pForExpr ) == SUCCESS ) + if ( SELF_COMPILE( ( AREAP ) pArea, ( BYTE *) pForExpr ) == HB_SUCCESS ) { PHB_ITEM pForItem = pArea->valResult; pArea->valResult = NULL; - if ( SELF_EVALBLOCK( ( AREAP ) pArea, pForItem ) == SUCCESS ) + if ( SELF_EVALBLOCK( ( AREAP ) pArea, pForItem ) == HB_SUCCESS ) { if ( hb_itemType( pArea->valResult ) == HB_IT_LOGICAL ) { @@ -8104,7 +8104,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI { pInfo->itmResult = hb_itemPutL( pInfo->itmResult, hb_cdxDBOIKeyGoto( pArea, pTag, - hb_itemGetNL( pInfo->itmNewVal ), TRUE ) == SUCCESS ); + hb_itemGetNL( pInfo->itmNewVal ), TRUE ) == HB_SUCCESS ); } else pInfo->itmResult = hb_itemPutNL( pInfo->itmResult, @@ -8118,7 +8118,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI { pInfo->itmResult = hb_itemPutL( pInfo->itmResult, hb_cdxDBOIKeyGoto( pArea, pTag, - hb_itemGetNL( pInfo->itmNewVal ), FALSE ) == SUCCESS ); + hb_itemGetNL( pInfo->itmNewVal ), FALSE ) == HB_SUCCESS ); } else pInfo->itmResult = hb_itemPutNL( pInfo->itmResult, @@ -8137,7 +8137,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI case DBOI_RELKEYPOS: if ( pInfo->itmNewVal && HB_IS_NUMERIC( pInfo->itmNewVal ) ) - hb_cdxDBOISetRelKeyPos( pArea, pTag, + hb_cdxDBOISetRelKeyPos( pArea, pTag, hb_itemGetND( pInfo->itmNewVal ) ); else pInfo->itmResult = hb_itemPutND( pInfo->itmResult, @@ -8152,14 +8152,14 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI case DBOI_FINDRECCONT: pInfo->itmResult = hb_itemPutL( pInfo->itmResult, - hb_cdxDBOIFindRec( pArea, pTag, + hb_cdxDBOIFindRec( pArea, pTag, hb_itemGetNL( pInfo->itmNewVal ), TRUE ) ); break; case DBOI_SKIPUNIQUE: pInfo->itmResult = hb_itemPutL( pInfo->itmResult, hb_cdxDBOISkipUnique( pArea, pTag, - hb_itemGetNI( pInfo->itmNewVal ) >= 0 ) == SUCCESS ); + hb_itemGetNI( pInfo->itmNewVal ) >= 0 ) == HB_SUCCESS ); break; case DBOI_SKIPEVAL: @@ -8430,7 +8430,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI SELF_FORCEREL( ( AREAP ) pArea ); if( !pArea->fPositioned || - ( pTag->pForItem && + ( pTag->pForItem && !hb_cdxEvalCond( pArea, pTag->pForItem, TRUE ) ) ) { pInfo->itmResult = hb_itemPutL( pInfo->itmResult, FALSE ); @@ -8470,7 +8470,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI SELF_FORCEREL( ( AREAP ) pArea ); if( !pArea->fPositioned || - ( pTag->pForItem && + ( pTag->pForItem && !hb_cdxEvalCond( pArea, pTag->pForItem, TRUE ) ) ) { pInfo->itmResult = hb_itemPutL( pInfo->itmResult, FALSE ); @@ -8580,11 +8580,11 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI return SUPER_ORDINFO( ( AREAP ) pArea, uiIndex, pInfo ); } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_V ) hb_cdxClearFilter */ -static ERRCODE hb_cdxClearFilter( CDXAREAP pArea ) +static HB_ERRCODE hb_cdxClearFilter( CDXAREAP pArea ) { hb_cdxClearLogPosInfo( pArea ); return SUPER_CLEARFILTER( ( AREAP ) pArea ); @@ -8594,13 +8594,13 @@ static ERRCODE hb_cdxClearFilter( CDXAREAP pArea ) /* ( DBENTRYP_V ) hb_cdxClearScope : NULL */ /* ( DBENTRYP_VPLP ) hb_cdxCountScope */ -static ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ) +static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ) { HB_TRACE(HB_TR_DEBUG, ("hb_cdxCountScope(%p, %p, %p)", pArea, pPtr, plRec)); if ( pPtr == NULL ) { - return SUCCESS; + return HB_SUCCESS; } return SUPER_COUNTSCOPE( ( AREAP ) pArea, pPtr, plRec ); } @@ -8609,7 +8609,7 @@ static ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ) /* ( DBENTRYP_SI ) hb_cdxScopeInfo : NULL */ /* ( DBENTRYP_VFI ) hb_cdxSetFilter */ -static ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo ) +static HB_ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo ) { hb_cdxClearLogPosInfo( pArea ); return SUPER_SETFILTER( ( AREAP ) pArea, pFilterInfo ); @@ -8642,7 +8642,7 @@ static ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo ) * Retrieve (set) information about RDD * ( DBENTRYP_RSLV ) hb_fptFieldInfo */ -static ERRCODE hb_cdxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +static HB_ERRCODE hb_cdxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { LPDBFDATA pData; @@ -8693,7 +8693,7 @@ static ERRCODE hb_cdxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P } - return SUCCESS; + return HB_SUCCESS; } @@ -9365,7 +9365,7 @@ static void hb_cdxTagDoIndex( LPCDXTAG pTag, BOOL fReindex ) { ulRecCount = 0; } - else if( SELF_RECCOUNT( ( AREAP ) pArea, &ulRecCount ) != SUCCESS ) + else if( SELF_RECCOUNT( ( AREAP ) pArea, &ulRecCount ) != HB_SUCCESS ) { return; } @@ -9477,13 +9477,13 @@ static void hb_cdxTagDoIndex( LPCDXTAG pTag, BOOL fReindex ) } pArea->pRecord = pSort->pRecBuff + iRecBuff * pArea->uiRecordLen; pArea->ulRecNo = ulRecNo; - if( SELF_GETREC( ( AREAP ) pArea, NULL ) == FAILURE ) + if( SELF_GETREC( ( AREAP ) pArea, NULL ) == HB_FAILURE ) break; pArea->fValidBuffer = pArea->fPositioned = TRUE; pArea->fDeleted = pArea->pRecord[ 0 ] == '*'; /* Force relational movement in child WorkAreas */ if( pArea->lpdbRelations ) - if( SELF_SYNCCHILDREN( ( AREAP ) pArea ) == FAILURE ) + if( SELF_SYNCCHILDREN( ( AREAP ) pArea ) == HB_FAILURE ) break; iRecBuff++; } @@ -9579,9 +9579,9 @@ static void hb_cdxTagDoIndex( LPCDXTAG pTag, BOOL fReindex ) ulRecNo++; else { - if( SELF_SKIPRAW( ( AREAP ) pArea, 1 ) == FAILURE ) + if( SELF_SKIPRAW( ( AREAP ) pArea, 1 ) == HB_FAILURE ) break; - if( fUseFilter && SELF_SKIPFILTER( ( AREAP ) pArea, 1 ) == FAILURE ) + if( fUseFilter && SELF_SKIPFILTER( ( AREAP ) pArea, 1 ) == HB_FAILURE ) break; ulRecNo = pArea->ulRecNo; } @@ -9649,17 +9649,17 @@ HB_FUNC( SIXCDX_GETFUNCTABLE ) if ( pTable ) { - ERRCODE errCode; + HB_ERRCODE errCode; if ( uiCount ) * uiCount = RDDFUNCSCOUNT; errCode = hb_rddInherit( pTable, &cdxTable, &cdxSuper, "DBFFPT" ); - if ( errCode != SUCCESS ) + if ( errCode != HB_SUCCESS ) errCode = hb_rddInherit( pTable, &cdxTable, &cdxSuper, "DBFDBT" ); - if ( errCode != SUCCESS ) + if ( errCode != HB_SUCCESS ) errCode = hb_rddInherit( pTable, &cdxTable, &cdxSuper, "DBF" ); hb_retni( errCode ); - if ( errCode == SUCCESS ) + if ( errCode == HB_SUCCESS ) { /* * we successfully register our RDD so now we can initialize it @@ -9669,7 +9669,7 @@ HB_FUNC( SIXCDX_GETFUNCTABLE ) } } else - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } static void hb_dbfcdxRddInit( void * cargo ) @@ -9713,16 +9713,16 @@ HB_FUNC( DBFCDX_GETFUNCTABLE ) if ( pTable ) { - ERRCODE errCode; + HB_ERRCODE errCode; if ( uiCount ) * uiCount = RDDFUNCSCOUNT; errCode = hb_rddInherit( pTable, &cdxTable, &cdxSuper, "DBFFPT" ); - if ( errCode != SUCCESS ) + if ( errCode != HB_SUCCESS ) errCode = hb_rddInherit( pTable, &cdxTable, &cdxSuper, "DBFDBT" ); - if ( errCode != SUCCESS ) + if ( errCode != HB_SUCCESS ) errCode = hb_rddInherit( pTable, &cdxTable, &cdxSuper, "DBF" ); - if ( errCode == SUCCESS ) + if ( errCode == HB_SUCCESS ) { /* * we successfully register our RDD so now we can initialize it @@ -9733,7 +9733,7 @@ HB_FUNC( DBFCDX_GETFUNCTABLE ) hb_retni( errCode ); } else - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } static void hb_dbfcdxRddInit( void * cargo ) diff --git a/harbour/source/rdd/dbffpt/dbffpt1.c b/harbour/source/rdd/dbffpt/dbffpt1.c index 9ab1c958ec..5f14d3d68d 100644 --- a/harbour/source/rdd/dbffpt/dbffpt1.c +++ b/harbour/source/rdd/dbffpt/dbffpt1.c @@ -236,9 +236,9 @@ static const RDDFUNCS fptTable = /* * generate Run-Time error */ -static ERRCODE hb_memoErrorRT( FPTAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, char * szFileName, USHORT uiOsCode, USHORT uiFlags ) +static HB_ERRCODE hb_memoErrorRT( FPTAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, char * szFileName, USHORT uiOsCode, USHORT uiFlags ) { - ERRCODE errCode = FAILURE; + HB_ERRCODE errCode = HB_FAILURE; if( hb_vmRequestQuery() == 0 ) { @@ -379,7 +379,7 @@ static BOOL hb_fptRootBlockUnLock( FPTAREAP pArea ) /* * Read root block pointer. */ -static ERRCODE hb_fptGetRootBlock( FPTAREAP pArea, ULONG * pulBlock ) +static HB_ERRCODE hb_fptGetRootBlock( FPTAREAP pArea, ULONG * pulBlock ) { *pulBlock = 0; @@ -390,7 +390,7 @@ static ERRCODE hb_fptGetRootBlock( FPTAREAP pArea, ULONG * pulBlock ) if( hb_fileReadAt( pArea->pMemoFile, buffer, 4, FPT_ROOTBLOCK_OFFSET ) == 4 ) { *pulBlock = HB_GET_LE_UINT32( buffer ); - return SUCCESS; + return HB_SUCCESS; } else return EDBF_READ; @@ -401,7 +401,7 @@ static ERRCODE hb_fptGetRootBlock( FPTAREAP pArea, ULONG * pulBlock ) /* * Write root block pointer. */ -static ERRCODE hb_fptPutRootBlock( FPTAREAP pArea, ULONG ulBlock ) +static HB_ERRCODE hb_fptPutRootBlock( FPTAREAP pArea, ULONG ulBlock ) { if( hb_fptHasDirectAccess( pArea ) ) { @@ -409,7 +409,7 @@ static ERRCODE hb_fptPutRootBlock( FPTAREAP pArea, ULONG ulBlock ) HB_PUT_LE_UINT32( buffer, ulBlock ); if( hb_fileWriteAt( pArea->pMemoFile, buffer, 4, FPT_ROOTBLOCK_OFFSET ) == 4 ) - return SUCCESS; + return HB_SUCCESS; else return EDBF_WRITE; } @@ -581,10 +581,10 @@ static void hb_fptPackGCitems( LPMEMOGCTABLE pGCtable ) /* * Write proper header into modified GC free memo blocks. */ -static ERRCODE hb_fptWriteGCitems( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, USHORT usItem ) +static HB_ERRCODE hb_fptWriteGCitems( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, USHORT usItem ) { FPTBLOCK fptBlock; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; int i /* ,iStart, iStop */; HB_SYMBOL_UNUSED( usItem ); @@ -630,15 +630,15 @@ static ERRCODE hb_fptWriteGCitems( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, USHOR /* * Add new block to GC free memo blocks list. */ -static ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, +static HB_ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, ULONG ulOffset, ULONG ulByteSize, BOOL fRaw ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; ULONG ulSize; if( pArea->bMemoType == DB_MEMO_DBT ) { - return SUCCESS; + return HB_SUCCESS; } else if( pArea->bMemoType == DB_MEMO_FPT && !fRaw ) { @@ -738,7 +738,7 @@ static ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, /* * Get free memo block from GC free memo blocks list or allocate new one. */ -static ERRCODE hb_fptGCgetFreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, +static HB_ERRCODE hb_fptGCgetFreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, ULONG * ulOffset, ULONG ulByteSize, BOOL fRaw ) { @@ -800,7 +800,7 @@ static ERRCODE hb_fptGCgetFreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, pGCtable->ulNextBlock += ulSize; pGCtable->bChanged |= 1; } - return SUCCESS; + return HB_SUCCESS; } /* @@ -828,7 +828,7 @@ static void hb_fptDestroyGCdata( LPMEMOGCTABLE pGCtable ) /* * Read GC table from memo file. */ -static ERRCODE hb_fptReadGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) +static HB_ERRCODE hb_fptReadGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) { int i; @@ -918,7 +918,7 @@ static ERRCODE hb_fptReadGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) hb_fptSortGCitems( pGCtable ); } - return SUCCESS; + return HB_SUCCESS; } return EDBF_READ; } @@ -926,9 +926,9 @@ static ERRCODE hb_fptReadGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) /* * Write GC table into memo file. */ -static ERRCODE hb_fptWriteGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) +static HB_ERRCODE hb_fptWriteGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; ULONG ulHdrSize = 512; int i, j; @@ -977,7 +977,7 @@ static ERRCODE hb_fptWriteGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) pGCtable->ulSize = FLEXGCPAGE_SIZE; errCode = hb_fptGCgetFreeBlock( pArea, pGCtable, &pGCtable->ulDirPage, pGCtable->ulSize, FALSE ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pGCtable->ulDirPage *= pArea->uiMemoBlockSize; errCode = hb_fptGCgetFreeBlock( pArea, pGCtable, @@ -1040,11 +1040,11 @@ static ERRCODE hb_fptWriteGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable ) HB_PUT_LE_UINT32( pGCtable->fptHeader.counter, pGCtable->ulCounter ); } - if( pGCtable->bChanged > 1 && errCode == SUCCESS ) + if( pGCtable->bChanged > 1 && errCode == HB_SUCCESS ) { errCode = hb_fptWriteGCitems( pArea, pGCtable, 0 ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( pArea->bMemoType == DB_MEMO_SMT || pArea->bMemoType == DB_MEMO_DBT ) HB_PUT_LE_UINT32( pGCtable->fptHeader.nextBlock, pGCtable->ulNextBlock ); @@ -1078,7 +1078,7 @@ static ULONG hb_fptGetMemoLen( FPTAREAP pArea, USHORT uiIndex ) HB_TRACE(HB_TR_DEBUG, ("hb_fptGetMemoLen(%p, %hu)", pArea, uiIndex)); if( hb_dbfGetMemoData( ( DBFAREAP ) pArea, uiIndex - 1, &ulBlock, &ulSize, - &ulType ) == SUCCESS ) + &ulType ) == HB_SUCCESS ) { if( ulBlock != 0 ) { @@ -1125,7 +1125,7 @@ static const char * hb_fptGetMemoType( FPTAREAP pArea, USHORT uiIndex ) HB_TRACE(HB_TR_DEBUG, ("hb_fptGetMemoType(%p, %hu)", pArea, uiIndex)); if( hb_dbfGetMemoData( ( DBFAREAP ) pArea, uiIndex - 1, &ulBlock, &ulSize, - &ulType ) == SUCCESS ) + &ulType ) == HB_SUCCESS ) { if( ulBlock != 0 ) { @@ -1276,7 +1276,7 @@ static ULONG hb_fptCountSMTItemLength( FPTAREAP pArea, PHB_ITEM pItem, /* * Calculate the size of SMT memo data */ -static ERRCODE hb_fptCountSMTDataLength( FPTAREAP pArea, HB_FOFFSET * pfOffset ) +static HB_ERRCODE hb_fptCountSMTDataLength( FPTAREAP pArea, HB_FOFFSET * pfOffset ) { USHORT i, uiSize; BYTE buffer[ 2 ]; @@ -1294,8 +1294,8 @@ static ERRCODE hb_fptCountSMTDataLength( FPTAREAP pArea, HB_FOFFSET * pfOffset ) uiSize = HB_GET_LE_UINT16( buffer ); for( i = 0; i < uiSize; i++ ) { - ERRCODE errCode = hb_fptCountSMTDataLength( pArea, pfOffset ); - if( errCode != SUCCESS ) + HB_ERRCODE errCode = hb_fptCountSMTDataLength( pArea, pfOffset ); + if( errCode != HB_SUCCESS ) return errCode; } break; @@ -1327,7 +1327,7 @@ static ERRCODE hb_fptCountSMTDataLength( FPTAREAP pArea, HB_FOFFSET * pfOffset ) return EDBF_CORRUPT; } - return SUCCESS; + return HB_SUCCESS; } /* @@ -1420,7 +1420,7 @@ static ULONG hb_fptStoreSMTItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr /* * Read SMT item from file */ -static ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFSET *pfOffset ) +static HB_ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFSET *pfOffset ) { ULONG ulLen, i; BYTE buffer[ 10 ], *pBuffer; @@ -1441,9 +1441,9 @@ static ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFSET hb_arrayNew( pItem, ulLen ); for( i = 1; i <= ulLen; i++ ) { - ERRCODE errCode = hb_fptReadRawSMTItem( pArea, + HB_ERRCODE errCode = hb_fptReadRawSMTItem( pArea, hb_arrayGetItemPtr( pItem, i ), pfOffset ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } break; @@ -1507,16 +1507,16 @@ static ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFSET return EDBF_CORRUPT; } - return SUCCESS; + return HB_SUCCESS; } /* * Read SMT item from memory buffer. */ -static ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem ) { ULONG ulLen, i; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; int iWidth, iDec; if( bBufEnd - (*pbMemoBuf) >= 1 ) @@ -1541,7 +1541,7 @@ static ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBuf { errCode = hb_fptReadSMTItem( pArea, pbMemoBuf, bBufEnd, hb_arrayGetItemPtr( pItem, i ) ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } break; @@ -1782,11 +1782,11 @@ static ULONG hb_fptStoreSixItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr /* * Read SIX item from memo. */ -static ERRCODE hb_fptReadSixItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptReadSixItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem ) { USHORT usType; ULONG ulLen, i; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; ulLen = SIX_ITEM_BUFSIZE; if( bBufEnd - (*pbMemoBuf) >= ( LONG ) ulLen ) @@ -1848,7 +1848,7 @@ static ERRCODE hb_fptReadSixItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBuf { errCode = hb_fptReadSixItem( pArea, pbMemoBuf, bBufEnd, hb_arrayGetItemPtr( pItem, i ) ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { break; } @@ -2027,11 +2027,11 @@ static void hb_fptStoreFlexItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr /* * Read FLEX item from memo. */ -static ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, BOOL bRoot ) +static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, BOOL bRoot ) { BYTE usType; ULONG ulLen, i; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; if( bRoot ) { @@ -2387,7 +2387,7 @@ static ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBu { errCode = hb_fptReadFlexItem( pArea, pbMemoBuf, bBufEnd, hb_arrayGetItemPtr( pItem, i ), FALSE ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { break; } @@ -2412,11 +2412,11 @@ static ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBu return errCode; } -static ERRCODE hb_fptCopyToRawFile( PHB_FILE pSrc, HB_FOFFSET from, +static HB_ERRCODE hb_fptCopyToRawFile( PHB_FILE pSrc, HB_FOFFSET from, HB_FHANDLE hDst, HB_FOFFSET size ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; if( size ) { HB_FOFFSET written = 0; @@ -2438,7 +2438,7 @@ static ERRCODE hb_fptCopyToRawFile( PHB_FILE pSrc, HB_FOFFSET from, else written += ulRead; } - while( errCode == SUCCESS && written < size ); + while( errCode == HB_SUCCESS && written < size ); hb_xfree( pBuffer ); } @@ -2446,11 +2446,11 @@ static ERRCODE hb_fptCopyToRawFile( PHB_FILE pSrc, HB_FOFFSET from, return errCode; } -static ERRCODE hb_fptCopyToFile( PHB_FILE pSrc, HB_FOFFSET from, +static HB_ERRCODE hb_fptCopyToFile( PHB_FILE pSrc, HB_FOFFSET from, PHB_FILE pDst, HB_FOFFSET to, HB_FOFFSET size ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; if( size ) { HB_FOFFSET written = 0; @@ -2473,7 +2473,7 @@ static ERRCODE hb_fptCopyToFile( PHB_FILE pSrc, HB_FOFFSET from, else written += ulRead; } - while( errCode == SUCCESS && written < size ); + while( errCode == HB_SUCCESS && written < size ); hb_xfree( pBuffer ); } @@ -2481,10 +2481,10 @@ static ERRCODE hb_fptCopyToFile( PHB_FILE pSrc, HB_FOFFSET from, return errCode; } -static ERRCODE hb_fptReadRawBlock( FPTAREAP pArea, BYTE * bBuffer, HB_FHANDLE hFile, +static HB_ERRCODE hb_fptReadRawBlock( FPTAREAP pArea, BYTE * bBuffer, HB_FHANDLE hFile, ULONG ulBlock, ULONG ulSize ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; if( ulBlock == 0 ) return EDBF_CORRUPT; @@ -2504,7 +2504,7 @@ static ERRCODE hb_fptReadRawBlock( FPTAREAP pArea, BYTE * bBuffer, HB_FHANDLE hF return errCode; } -static ERRCODE hb_fptReadBlobBlock( FPTAREAP pArea, PHB_ITEM pItem, +static HB_ERRCODE hb_fptReadBlobBlock( FPTAREAP pArea, PHB_ITEM pItem, HB_FHANDLE hFile, ULONG ulBlock, USHORT uiMode ) { @@ -2544,10 +2544,10 @@ static ERRCODE hb_fptReadBlobBlock( FPTAREAP pArea, PHB_ITEM pItem, } hb_itemPutCLPtr( pItem, ( char * ) bBuffer, ulSize ); } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem, +static HB_ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem, ULONG ulBlock, ULONG ulSize ) { if( ulBlock == 0 ) @@ -2560,7 +2560,7 @@ static ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem, } else { - ERRCODE errCode; + HB_ERRCODE errCode; BYTE * bBuffer = ( BYTE * ) hb_xalloc( ulSize ), * bMemoBuf; if( !bBuffer ) @@ -2587,11 +2587,11 @@ static ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem, /* * Read fpt vartype memos. */ -static ERRCODE hb_fptGetMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, +static HB_ERRCODE hb_fptGetMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, HB_FHANDLE hFile, ULONG ulBlock, ULONG ulStart, ULONG ulCount ) { - ERRCODE errCode; + HB_ERRCODE errCode; ULONG ulSize = 0, ulType = 0; BYTE * pBuffer, * bMemoBuf; FPTBLOCK fptBlock; @@ -2609,10 +2609,10 @@ static ERRCODE hb_fptGetMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, } else { - errCode = SUCCESS; + errCode = HB_SUCCESS; } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( ulBlock > 0 ) @@ -2814,12 +2814,12 @@ static ERRCODE hb_fptGetMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, /* * Write memo data. */ -static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, +static HB_ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, BYTE *bBufPtr, HB_FHANDLE hFile, ULONG ulType, ULONG ulLen, ULONG * ulStoredBlock ) { MEMOGCTABLE fptGCtable; - ERRCODE errCode; + HB_ERRCODE errCode; BOOL bWrite; HB_TRACE(HB_TR_DEBUG, ("hb_fptWriteMemo(%p, %lu, %lu, %p, %p, %lu, %lu, %p)", @@ -2832,12 +2832,12 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, if( ulBlock == 0 && !bWrite ) { * ulStoredBlock = 0; - return SUCCESS; + return HB_SUCCESS; } hb_fptInitGCdata( &fptGCtable ); errCode = hb_fptReadGCdata( pArea, &fptGCtable ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { return errCode; } @@ -2846,7 +2846,7 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, { errCode = hb_fptGCfreeBlock( pArea, &fptGCtable, ulBlock, ulSize, ulType == FPTIT_DUMMY ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_fptDestroyGCdata( &fptGCtable ); return errCode; @@ -2860,7 +2860,7 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, errCode = hb_fptGCgetFreeBlock( pArea, &fptGCtable, ulStoredBlock, ulLen, ulType == FPTIT_DUMMY ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_fptDestroyGCdata( &fptGCtable ); return errCode; @@ -2879,7 +2879,7 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, fOffset +=sizeof( FPTBLOCK ); } - if( errCode == SUCCESS && ulLen > 0 ) + if( errCode == HB_SUCCESS && ulLen > 0 ) { /* TODO: uiMode => BLOB_IMPORT_COMPRESS, BLOB_IMPORT_ENCRYPT */ if( hFile != FS_ERROR ) @@ -2902,7 +2902,7 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, fOffset += ulRead; } } - while( errCode == SUCCESS && ulWritten < ulLen ); + while( errCode == HB_SUCCESS && ulWritten < ulLen ); hb_xfree(bBuffer); } @@ -2917,7 +2917,7 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, } /* if written block is smaller then block size we should write at last block byte 0xAF to be FLEX compatible */ - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( pArea->bMemoType == DB_MEMO_DBT ) { @@ -2939,7 +2939,7 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, * ulStoredBlock = 0; } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = hb_fptWriteGCdata( pArea, &fptGCtable ); } @@ -2951,13 +2951,13 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, /* * Assign a value to the specified memo field. */ -static ERRCODE hb_fptPutMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, +static HB_ERRCODE hb_fptPutMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, ULONG * pulBlock ) { ULONG ulBlock = 0, ulSize, ulType, ulOldSize = 0, ulOldType = 0, ulArrayCount = 0; BYTE itmBuffer[FLEX_ITEM_BUFSIZE]; BYTE *bBufPtr = NULL, *bBufAlloc = NULL; - ERRCODE errCode; + HB_ERRCODE errCode; HB_LONG iVal; LONG lVal; @@ -3113,10 +3113,10 @@ static ERRCODE hb_fptPutMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, else { ulBlock = *pulBlock; - errCode = SUCCESS; + errCode = HB_SUCCESS; } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = hb_fptWriteMemo( pArea, ulBlock, ulOldSize, bBufPtr, FS_ERROR, ulType, ulSize, &ulBlock ); @@ -3125,7 +3125,7 @@ static ERRCODE hb_fptPutMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, hb_xfree( bBufAlloc ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( uiIndex ) hb_dbfSetMemoData( (DBFAREAP) pArea, uiIndex - 1, ulBlock, ulSize, ulType ); @@ -3194,9 +3194,9 @@ static BOOL hb_fptHasMemoData( FPTAREAP pArea, USHORT uiIndex ) } #endif -static ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLock ) +static HB_ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLock ) { - ERRCODE uiError; + HB_ERRCODE uiError; BOOL fLocked; *fUnLock = FALSE; @@ -3204,7 +3204,7 @@ static ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLock if( pArea->lpdbPendingRel ) { uiError = SELF_FORCEREL( ( AREAP ) pArea ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) return uiError; } @@ -3223,7 +3223,7 @@ static ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLock fLocked = hb_itemGetL( pResult ); hb_itemRelease( pRecNo ); hb_itemRelease( pResult ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) return uiError; } @@ -3233,7 +3233,7 @@ static ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLock hb_fptHasMemoData( pArea, uiIndex ) ) { if( !hb_fptFileLockSh( pArea, TRUE ) ) - return FAILURE; + return HB_FAILURE; *fUnLock = TRUE; pArea->fValidBuffer = FALSE; @@ -3248,10 +3248,10 @@ static ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLock return uiError; } -static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, HB_FHANDLE hFile ) +static HB_ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, HB_FHANDLE hFile ) { LPFIELD pField; - ERRCODE uiError; + HB_ERRCODE uiError; BYTE * pFieldBuf; BOOL fUnLock = FALSE; @@ -3264,7 +3264,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem USHORT uiType; uiError = hb_fptLockForRead( pArea, uiIndex, &fUnLock ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) return uiError; pFieldBuf = pArea->pRecord + pArea->pFieldOffset[ uiIndex - 1 ]; @@ -3305,7 +3305,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem } uiError = hb_fptReadRawBlock( pArea, ( BYTE * ) pBuf, FS_ERROR, ulBlock, ulSize ); } - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { pString[ uiType ] = '\0'; #ifndef HB_CDP_SUPPORT_OFF @@ -3346,7 +3346,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem if( pField->uiLen <= 12 ) { uiError = hb_fptReadRawBlock( pArea, pBuffer, FS_ERROR, ulBlock, 11 ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { if( pBuffer[ 0 ] == SMT_IT_DOUBLE ) pFieldBuf = pBuffer + 1; @@ -3354,7 +3354,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem uiError = EDBF_CORRUPT; } } - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { iWidth = *pFieldBuf++; iDec = *pFieldBuf++; @@ -3387,7 +3387,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem pField->uiType == HB_FT_OLE ) { uiError = hb_fptLockForRead( pArea, uiIndex, &fUnLock ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) return uiError; uiError = hb_fptGetMemo( pArea, uiIndex, pItem, hFile, 0, 0, 0 ); @@ -3398,7 +3398,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem } else { - return FAILURE; + return HB_FAILURE; } if( fUnLock ) @@ -3407,7 +3407,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem return uiError; } -static ERRCODE hb_fptGetVarFile( FPTAREAP pArea, ULONG ulBlock, BYTE * szFile, USHORT uiMode ) +static HB_ERRCODE hb_fptGetVarFile( FPTAREAP pArea, ULONG ulBlock, BYTE * szFile, USHORT uiMode ) { USHORT uiError; HB_FHANDLE hFile; @@ -3432,18 +3432,18 @@ static ERRCODE hb_fptGetVarFile( FPTAREAP pArea, ULONG ulBlock, BYTE * szFile, U } /* Exit if any error */ - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { - if( uiError != FAILURE ) + if( uiError != HB_FAILURE ) { hb_memoErrorRT( pArea, 0, uiError, uiError == EDBF_OPEN_DBF || uiError == EDBF_CREATE || uiError == EDBF_WRITE ? ( char * ) szFile : pArea->szMemoFileName, 0, 0 ); } - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } static ULONG hb_fptPutVarFile( FPTAREAP pArea, ULONG ulBlock, BYTE * szFile ) @@ -3482,7 +3482,7 @@ static ULONG hb_fptPutVarFile( FPTAREAP pArea, ULONG ulBlock, BYTE * szFile ) hb_fsClose( hFile ); } - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { hb_memoErrorRT( pArea, 0, uiError, uiError == EDBF_OPEN_DBF || uiError == EDBF_READ ? @@ -3493,7 +3493,7 @@ static ULONG hb_fptPutVarFile( FPTAREAP pArea, ULONG ulBlock, BYTE * szFile ) return ulBlock; } -static ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { LPFIELD pField; @@ -3508,22 +3508,22 @@ static ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem pField->uiType == HB_FT_OLE ) { BYTE * pFieldBuf = pArea->pRecord + pArea->pFieldOffset[ uiIndex - 1 ]; - ERRCODE uiError; + HB_ERRCODE uiError; BOOL bDeleted; /* update any pending relations and reread record if necessary */ uiError = SELF_DELETED( ( AREAP ) pArea, &bDeleted ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) return uiError; if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; /* Buffer is hot? */ if( !pArea->fRecordChanged ) { uiError = SELF_GOHOT( ( AREAP ) pArea ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) return uiError; } @@ -3533,7 +3533,7 @@ static ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem return EDBF_LOCK; uiError = hb_fptPutMemo( pArea, uiIndex, pItem, NULL ); #if defined( HB_MEMO_SAFELOCK ) - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { /* Force writer record to eliminate race condition */ SELF_GOCOLD( ( AREAP ) pArea ); @@ -3589,7 +3589,7 @@ static ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem else if( uiType == HB_VF_ARRAY ) { HB_FOFFSET fOffset = FPT_BLOCK_OFFSET( ulOldBlock ); - if( hb_fptCountSMTDataLength( pArea, &fOffset ) != SUCCESS ) + if( hb_fptCountSMTDataLength( pArea, &fOffset ) != HB_SUCCESS ) ulOldSize = 0; else ulOldSize = fOffset - FPT_BLOCK_OFFSET( ulOldBlock ); @@ -3699,7 +3699,7 @@ static ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem uiError = hb_fptWriteMemo( pArea, ulOldBlock, ulOldSize, pBlock, FS_ERROR, FPTIT_DUMMY, ulNewSize, &ulOldBlock ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { if( ulNewSize ) HB_PUT_LE_UINT32( pFieldBuf + pField->uiLen - 6, ulOldBlock ); @@ -3732,20 +3732,20 @@ static ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem * Retrieve the size of the WorkArea structure. * ( DBENTRYP_SP ) hb_fptStructSize */ -static ERRCODE hb_fptStructSize( FPTAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_fptStructSize( FPTAREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("hb_fptStrucSize(%p, %p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( FPTAREA ); - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the length of a field value. * ( DBENTRYP_SVL ) hb_fptGetVarLen */ -static ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLength ) +static HB_ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLength ) { HB_TRACE(HB_TR_DEBUG, ("hb_fptGetVarLen(%p, %hu, %p)", pArea, uiIndex, pLength)); @@ -3756,11 +3756,11 @@ static ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLength pArea->lpFields[ uiIndex - 1 ].uiType == HB_FT_BLOB || pArea->lpFields[ uiIndex - 1 ].uiType == HB_FT_OLE ) ) { - ERRCODE uiError; + HB_ERRCODE uiError; BOOL fUnLock; uiError = hb_fptLockForRead( pArea, uiIndex, &fUnLock ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) *pLength = hb_fptGetMemoLen( pArea, uiIndex ); else *pLength = 0; @@ -3778,47 +3778,47 @@ static ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLength * Obtain the current value of a field. * ( DBENTRYP_SI ) hb_fptGetValue */ -static ERRCODE hb_fptGetValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptGetValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_fptGetValue(%p, %hu, %p)", pArea, uiIndex, pItem)); if( !uiIndex || uiIndex > pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; uiError = hb_fptGetVarField( pArea, uiIndex, pItem, FS_ERROR ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { - if( uiError == FAILURE ) - return FAILURE; + if( uiError == HB_FAILURE ) + return HB_FAILURE; hb_memoErrorRT( pArea, 0, uiError, pArea->szMemoFileName, 0, 0 ); } - return SUCCESS; + return HB_SUCCESS; } /* * Assign a value to a field. * ( DBENTRYP_SI ) hb_fptPutValue */ -static ERRCODE hb_fptPutValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptPutValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_fptPutValue(%p, %hu, %p)", pArea, uiIndex, pItem)); if( !uiIndex || uiIndex > pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; uiError = hb_fptPutVarField( pArea, uiIndex, pItem ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { - if( uiError == FAILURE ) - return FAILURE; + if( uiError == HB_FAILURE ) + return HB_FAILURE; hb_memoErrorRT( pArea, 0, uiError, pArea->szMemoFileName, 0, EF_CANDEFAULT ); } - return SUCCESS; + return HB_SUCCESS; } /* ( DBENTRYP_V ) hb_fptCloseMemFile : NULL */ @@ -3827,7 +3827,7 @@ static ERRCODE hb_fptPutValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) * Create a memo file in the WorkArea. * ( DBENTRYP_VP ) hb_fptCreateMemFile */ -static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) +static HB_ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) { FPTHEADER fptHeader; ULONG ulNextBlock, ulSize, ulLen; @@ -3844,10 +3844,10 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) if( !pArea->bMemoType ) { pItem = hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOTYPE, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOTYPE, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); - return FAILURE; + return HB_FAILURE; } pArea->bMemoType = hb_itemGetNI( pItem ); /* @@ -3864,7 +3864,7 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) hb_memoErrorRT( pArea, EG_CREATE, EDBF_MEMOTYPE, ( char * ) pCreateInfo->abName, 0, 0 ); hb_itemRelease( pItem ); - return FAILURE; + return HB_FAILURE; } } if( !pArea->uiMemoVersion ) @@ -3874,10 +3874,10 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) else if( pArea->bMemoType == DB_MEMO_FPT ) { pItem = hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOVERSION, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOVERSION, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); - return FAILURE; + return HB_FAILURE; } pArea->uiMemoVersion = hb_itemGetNI( pItem ); } @@ -3887,10 +3887,10 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) if( !pArea->uiMemoBlockSize ) { pItem = hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOBLOCKSIZE, pItem ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pArea, DBI_MEMOBLOCKSIZE, pItem ) != HB_SUCCESS ) { hb_itemRelease( pItem ); - return FAILURE; + return HB_FAILURE; } pArea->uiMemoBlockSize = hb_itemGetNI( pItem ); } @@ -3944,7 +3944,7 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) hb_itemRelease( pError ); if( !pArea->pMemoFile ) - return FAILURE; + return HB_FAILURE; pArea->szMemoFileName = hb_strdup( ( char * ) szFileName ); } @@ -3982,7 +3982,7 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) HB_PUT_BE_UINT32( fptHeader.blockSize, ( UINT32 ) pArea->uiMemoBlockSize ); } if( hb_fileWriteAt( pArea->pMemoFile, ( BYTE * ) &fptHeader, ulSize, 0 ) != ulSize ) - return FAILURE; + return HB_FAILURE; ulLen = ulNextBlock * pArea->uiMemoBlockSize - ulSize; if( ulLen > ulSize ) @@ -3993,7 +3993,7 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) ULONG ulWrite = HB_MIN( ulLen - ulSize, sizeof( FPTHEADER ) ); if( hb_fileWriteAt( pArea->pMemoFile, ( BYTE * ) &fptHeader, ulWrite, ulSize ) != ulWrite ) - return FAILURE; + return HB_FAILURE; ulSize += ulWrite; } while( ulLen > ulSize ); @@ -4001,7 +4001,7 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) /* trunc file */ hb_fileTruncAt( pArea->pMemoFile, ulSize ); pArea->fMemoFlush = TRUE; - return SUCCESS; + return HB_SUCCESS; } @@ -4009,12 +4009,12 @@ static ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ) * BLOB2FILE - retrieve memo contents into file * ( DBENTRYP_SVPB ) hb_fptGetValueFile */ -static ERRCODE hb_fptGetValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) +static HB_ERRCODE hb_fptGetValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) { HB_TRACE(HB_TR_DEBUG, ("hb_fptGetValueFile(%p, %hu, %s, %hu)", pArea, uiIndex, szFile, uiMode)); if( !uiIndex || uiIndex > pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; if( pArea->fHasMemo && pArea->pMemoFile && ( pArea->lpFields[ uiIndex - 1 ].uiType == HB_FT_MEMO || @@ -4044,18 +4044,18 @@ static ERRCODE hb_fptGetValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile } /* Exit if any error */ - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { - if( uiError != FAILURE ) + if( uiError != HB_FAILURE ) { hb_memoErrorRT( pArea, 0, uiError, uiError == EDBF_OPEN_DBF || uiError == EDBF_CREATE || uiError == EDBF_WRITE ? ( char * ) szFile : pArea->szMemoFileName, 0, 0 ); } - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } return SUPER_GETVALUEFILE( ( AREAP ) pArea, uiIndex, szFile, uiMode ); } @@ -4064,7 +4064,7 @@ static ERRCODE hb_fptGetValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile * Open a memo file in the specified WorkArea. * ( DBENTRYP_VP ) hb_fptOpenMemFile */ -static ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo ) { BYTE szFileName[ _POSIX_PATH_MAX + 1 ]; PHB_FNAME pFileName; @@ -4085,7 +4085,7 @@ static ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo ) { hb_memoErrorRT( pArea, EG_OPEN, EDBF_MEMOTYPE, ( char * ) pOpenInfo->abName, 0, 0 ); - return FAILURE; + return HB_FAILURE; } /* create file name */ @@ -4136,7 +4136,7 @@ static ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo ) hb_itemRelease( pError ); if( !pArea->pMemoFile ) - return FAILURE; + return HB_FAILURE; pArea->szMemoFileName = hb_strdup( ( char * ) szFileName ); @@ -4189,24 +4189,24 @@ static ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo ) { hb_memoErrorRT( pArea, EG_CORRUPTION, EDBF_CORRUPT, ( char * ) pArea->szMemoFileName, 0, 0 ); - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * FILE2BLOB - store file contents in MEMO * ( DBENTRYP_SVPB ) hb_fptPutValueFile */ -static ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) +static HB_ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile, USHORT uiMode ) { LPFIELD pField; HB_TRACE(HB_TR_DEBUG, ("hb_fptPutValueFile(%p, %hu, %s, %hu)", pArea, uiIndex, szFile, uiMode)); if( !uiIndex || uiIndex > pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; pField = pArea->lpFields + uiIndex - 1; @@ -4223,15 +4223,15 @@ static ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile /* update any pending relations and reread record if necessary */ uiError = SELF_DELETED( ( AREAP ) pArea, &bDeleted ); - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) return uiError; if( !pArea->fPositioned ) - return FAILURE; + return HB_FAILURE; /* Buffer is hot? */ - if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( !pArea->fRecordChanged && SELF_GOHOT( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; hFile = hb_fsExtOpen( szFile, NULL, FO_READ | FO_DENYNONE | FXO_DEFAULTS | FXO_SHARELOCK, NULL, NULL ); @@ -4258,7 +4258,7 @@ static ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile pAlloc[ ulSize ] = '\0'; } hb_fsClose( hFile ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { PHB_ITEM pItem = hb_itemPutCLPtr( NULL, ( char * ) pAlloc, ulSize ); uiError = hb_fptPutVarField( pArea, uiIndex, pItem ); @@ -4293,13 +4293,13 @@ static ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile uiError = hb_dbfGetMemoData( (DBFAREAP) pArea, uiIndex - 1, &ulBlock, &ulOldSize, &ulOldType ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) uiError = hb_fptWriteMemo( pArea, ulBlock, ulOldSize, NULL, hFile, ulType, ulSize, &ulBlock ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) uiError = hb_dbfSetMemoData( (DBFAREAP) pArea, uiIndex - 1, ulBlock, ulSize, ulType ); #if defined( HB_MEMO_SAFELOCK ) - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { /* Force writer record to eliminate race condition */ SELF_GOCOLD( ( AREAP ) pArea ); @@ -4309,22 +4309,22 @@ static ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, BYTE * szFile hb_fsClose( hFile ); } /* Exit if any error */ - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { hb_memoErrorRT( pArea, 0, uiError, uiError == EDBF_OPEN_DBF || uiError == EDBF_READ ? ( char * ) szFile : pArea->szMemoFileName, 0, 0 ); - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } return SUPER_PUTVALUEFILE( ( AREAP ) pArea, uiIndex, szFile, uiMode ); } -static ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) +static HB_ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; ULONG ulBlock, ulSize, ulType; USHORT uiField; HB_FOFFSET pos, from; @@ -4343,12 +4343,12 @@ static ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) { errCode = hb_dbfGetMemoData( ( DBFAREAP ) pArea, uiField, &ulBlock, &ulSize, &ulType ); - if( errCode == SUCCESS && ulBlock != 0 ) + if( errCode == HB_SUCCESS && ulBlock != 0 ) { /* Buffer is hot? */ if( !pArea->fRecordChanged ) errCode = SELF_GOHOT( ( AREAP ) pArea ); - if( ulSize == 0 && errCode == SUCCESS ) + if( ulSize == 0 && errCode == HB_SUCCESS ) { if( pArea->bMemoType == DB_MEMO_DBT ) { @@ -4365,7 +4365,7 @@ static ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) ulSize = HB_GET_BE_UINT32( fptBlock.size ) + sizeof( FPTBLOCK ); } } - if( ulSize && errCode == SUCCESS ) + if( ulSize && errCode == HB_SUCCESS ) { from = FPT_BLOCK_OFFSET( ulBlock ); pos = hb_fileSize( pArea->pMemoTmpFile ); @@ -4379,7 +4379,7 @@ static ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) else ulBlock = ulType = 0; - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = hb_dbfSetMemoData( ( DBFAREAP ) pArea, uiField, ulBlock, ulSize, ulType ); } @@ -4418,12 +4418,12 @@ static ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) ulSize = ulType - ( pField->uiLen - 6 ); break; } - if( errCode == SUCCESS && ulSize ) + if( errCode == HB_SUCCESS && ulSize ) { /* Buffer is hot? */ if( !pArea->fRecordChanged ) errCode = SELF_GOHOT( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { from = FPT_BLOCK_OFFSET( ulBlock ); pos = hb_fileSize( pArea->pMemoTmpFile ); @@ -4433,7 +4433,7 @@ static ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) ( HB_FOFFSET ) pArea->uiNewBlockSize; errCode = hb_fptCopyToFile( pArea->pMemoFile, from, pArea->pMemoTmpFile, pos, ulSize ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) HB_PUT_LE_UINT32( pFieldBuf + pField->uiLen - 6, ulBlock ); } } @@ -4443,10 +4443,10 @@ static ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) return errCode; } -static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, +static HB_ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, PHB_ITEM pEvalBlock, LONG lEvalStep ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; HB_TRACE(HB_TR_DEBUG, ("hb_fptDoPack(%p,%hu,%p,%ld)", pArea, uiBlockSize, pEvalBlock, lEvalStep)); @@ -4454,8 +4454,8 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, errCode = EDBF_READONLY; else if( pArea->fShared ) errCode = EDBF_SHARED; - else if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + else if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; else if( pArea->fHasMemo && pArea->pMemoFile && pArea->pDataFile ) { BYTE szFile[ _POSIX_PATH_MAX + 1 ]; @@ -4466,7 +4466,7 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, pEvalBlock = NULL; errCode = SELF_RECCOUNT( ( AREAP ) pArea, &ulRecords ); - if( errCode == SUCCESS && ulRecords ) + if( errCode == HB_SUCCESS && ulRecords ) { pArea->uiNewBlockSize = uiBlockSize && pArea->bMemoType != DB_MEMO_DBT ? uiBlockSize : pArea->uiMemoBlockSize; @@ -4481,7 +4481,7 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, errCode = SELF_CREATEMEMFILE( ( AREAP ) pArea, NULL ); pArea->pMemoFile = pFile; pArea->uiMemoBlockSize = uiBlockSize; - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( pEvalBlock ) { @@ -4495,7 +4495,7 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, BOOL fDeleted; errCode = SELF_GOTO( ( AREAP ) pArea, ulRecNo ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; if( pEvalBlock ) { @@ -4508,24 +4508,24 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, /* read record into bugger */ errCode = SELF_DELETED( ( AREAP ) pArea, &fDeleted ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; errCode = hb_fptDoPackRec( pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } - if( errCode == SUCCESS && pEvalBlock ) + if( errCode == HB_SUCCESS && pEvalBlock ) { SELF_GOTO( ( AREAP ) pArea, 0 ); pArea->fBof = FALSE; hb_vmEvalBlock( pEvalBlock ); } } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { HB_FOFFSET size = hb_fileSize( pArea->pMemoTmpFile ); ULONG ulNextBlock; @@ -4543,11 +4543,11 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, pArea->pMemoFile, 0, size ); hb_fileTruncAt( pArea->pMemoFile, size ); pArea->uiMemoBlockSize = pArea->uiNewBlockSize; - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_memoErrorRT( pArea, 0, errCode, errCode == EDBF_READ ? ( char * ) szFile : pArea->szMemoFileName, 0, 0 ); - errCode = FAILURE; + errCode = HB_FAILURE; } } hb_fileClose( pArea->pMemoTmpFile ); @@ -4557,10 +4557,10 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, } } - if( errCode != SUCCESS && errCode != FAILURE ) + if( errCode != HB_SUCCESS && errCode != HB_FAILURE ) { hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 ); - errCode = FAILURE; + errCode = HB_FAILURE; } return errCode; @@ -4569,20 +4569,20 @@ static ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize, * Pack helper function called for each packed record * ( DBENTRYP_LSP ) hb_fptPackRec, */ -static ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten ) +static HB_ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten ) { HB_TRACE(HB_TR_DEBUG, ("hb_fptPackRec(%p, %lu, %p)", pArea, ulRecNo, pfWritten)); if( pArea->fPackMemo ) { - ERRCODE errCode = SUPER_PACKREC( ( AREAP ) pArea, ulRecNo, pfWritten ); - if( errCode == SUCCESS && *pfWritten ) + HB_ERRCODE errCode = SUPER_PACKREC( ( AREAP ) pArea, ulRecNo, pfWritten ); + if( errCode == HB_SUCCESS && *pfWritten ) { errCode = hb_fptDoPackRec( pArea ); - if( errCode != SUCCESS && errCode != FAILURE ) + if( errCode != HB_SUCCESS && errCode != HB_FAILURE ) { hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 ); - errCode = FAILURE; + errCode = HB_FAILURE; } } return errCode; @@ -4595,7 +4595,7 @@ static ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten ) * Remove records marked for deletion from a database. * ( DBENTRYP_V ) hb_fptPack, */ -static ERRCODE hb_fptPack( FPTAREAP pArea ) +static HB_ERRCODE hb_fptPack( FPTAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_fptPack(%p)", pArea)); @@ -4604,13 +4604,13 @@ static ERRCODE hb_fptPack( FPTAREAP pArea ) { BYTE szFile[ _POSIX_PATH_MAX + 1 ]; - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->pMemoTmpFile = hb_fileCreateTemp( NULL, NULL, FC_NORMAL, szFile ); if( pArea->pMemoTmpFile ) { - ERRCODE errCode; + HB_ERRCODE errCode; PHB_FILE pFile = pArea->pMemoFile; pArea->uiNewBlockSize = pArea->uiMemoBlockSize; @@ -4619,12 +4619,12 @@ static ERRCODE hb_fptPack( FPTAREAP pArea ) errCode = SELF_CREATEMEMFILE( ( AREAP ) pArea, NULL ); pArea->pMemoFile = pFile; - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pArea->fPackMemo = TRUE; errCode = SUPER_PACK( ( AREAP ) pArea ); pArea->fPackMemo = FALSE; - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { HB_FOFFSET size = hb_fileSize( pArea->pMemoTmpFile ); ULONG ulNextBlock; @@ -4643,11 +4643,11 @@ static ERRCODE hb_fptPack( FPTAREAP pArea ) pArea->pMemoFile, 0, size ); hb_fileTruncAt( pArea->pMemoFile, size ); pArea->uiMemoBlockSize = pArea->uiNewBlockSize; - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_memoErrorRT( pArea, 0, errCode, errCode == EDBF_READ ? ( char * ) szFile : pArea->szMemoFileName, 0, 0 ); - errCode = FAILURE; + errCode = HB_FAILURE; } } } @@ -4665,7 +4665,7 @@ static ERRCODE hb_fptPack( FPTAREAP pArea ) * Retrieve information about the current driver. * ( DBENTRYP_SI ) hb_fptInfo */ -static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_fptInfo(%p, %hu, %p)", pArea, uiIndex, pItem)); @@ -4748,7 +4748,7 @@ static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) case DBI_BLOB_DIRECT_EXPORT: /* BLOBDirectExport() { , , } */ { - ERRCODE errCode = FAILURE; + HB_ERRCODE errCode = HB_FAILURE; if( HB_IS_ARRAY( pItem ) ) { @@ -4759,7 +4759,7 @@ static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) errCode = hb_fptGetVarFile( pArea, ulBlock, szFile, hb_arrayGetNI( pItem, 3 ) ); } - hb_itemPutL( pItem, errCode == SUCCESS ); + hb_itemPutL( pItem, errCode == HB_SUCCESS ); break; } case DBI_BLOB_DIRECT_GET: /* BLOBDirectGet() { , , } */ @@ -4781,11 +4781,11 @@ static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) ulBlock = ulStart = ulCount = 0; } errCode = hb_fptGetMemo( pArea, 0, pItem, FS_ERROR, ulBlock, ulStart, ulCount ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { - if( errCode != FAILURE ) + if( errCode != HB_FAILURE ) hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 ); - return FAILURE; + return HB_FAILURE; } break; } @@ -4820,11 +4820,11 @@ static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) } } hb_itemPutNInt( pItem, ulBlock ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { - if( errCode != FAILURE ) + if( errCode != HB_FAILURE ) hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 ); - return FAILURE; + return HB_FAILURE; } break; } @@ -4834,16 +4834,16 @@ static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) USHORT errCode; errCode = hb_fptGetRootBlock( pArea, &ulBlock ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = hb_fptGetMemo( pArea, 0, pItem, FS_ERROR, ulBlock, 0, 0 ); } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { - if( errCode != FAILURE ) + if( errCode != HB_FAILURE ) hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 ); hb_itemClear( pItem ); - return FAILURE; + return HB_FAILURE; } break; } @@ -4853,24 +4853,24 @@ static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) USHORT errCode; errCode = hb_fptGetRootBlock( pArea, &ulBlock ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( hb_fptFileLockEx( pArea, TRUE ) ) { errCode = hb_fptPutMemo( pArea, 0, pItem, &ulBlock ); hb_fptFileUnLock( pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = hb_fptPutRootBlock( pArea, ulBlock ); } else errCode = EDBF_LOCK; } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { - if( errCode != FAILURE ) + if( errCode != HB_FAILURE ) hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 ); hb_itemPutL( pItem, FALSE ); - return FAILURE; + return HB_FAILURE; } hb_itemPutL( pItem, TRUE ); break; @@ -4895,19 +4895,19 @@ static ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) return SUPER_INFO( ( AREAP ) pArea, uiIndex, pItem ); } - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve information about a field. * ( DBENTRYP_SSI ) hb_fptFieldInfo */ -static ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_fptFieldInfo(%p, %hu, %hu, %p)", pArea, uiIndex, uiType, pItem)); if( !uiIndex || uiIndex > pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; if( pArea->fHasMemo && pArea->pMemoFile && ( pArea->lpFields[ uiIndex - 1 ].uiType == HB_FT_MEMO || @@ -4939,24 +4939,24 @@ static ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, P ulStart = ulCount = 0; } errCode = hb_fptGetMemo( pArea, uiIndex, pItem, FS_ERROR, 0, ulStart, ulCount ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { - if( errCode != FAILURE ) + if( errCode != HB_FAILURE ) hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 ); - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } case DBS_BLOB_LEN: hb_itemPutNL( pItem, hb_fptGetMemoLen( pArea, uiIndex ) ); - return SUCCESS; + return HB_SUCCESS; case DBS_BLOB_OFFSET: /* Clipper 5.3 does not support it :-( [druzus] */ hb_dbfGetMemoData( (DBFAREAP) pArea, uiIndex - 1, &ulBlock, &ulSize, &ulType ); hb_itemPutNInt( pItem, ( HB_FOFFSET ) ulBlock * pArea->uiMemoBlockSize + ( pArea->bMemoType == DB_MEMO_FPT ? sizeof( FPTBLOCK ) : 0 ) ); - return SUCCESS; + return HB_SUCCESS; case DBS_BLOB_POINTER: /* * Clipper 5.3 it returns the same value as DBS_BLOB_OFFSET @@ -4965,10 +4965,10 @@ static ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, P hb_dbfGetMemoData( (DBFAREAP) pArea, uiIndex - 1, &ulBlock, &ulSize, &ulType ); hb_itemPutNL( pItem, ulBlock ); - return SUCCESS; + return HB_SUCCESS; case DBS_BLOB_TYPE: hb_itemPutC( pItem, hb_fptGetMemoType( pArea, uiIndex ) ); - return SUCCESS; + return HB_SUCCESS; } } return SUPER_FIELDINFO( ( AREAP ) pArea, uiIndex, uiType, pItem ); @@ -4978,7 +4978,7 @@ static ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, P * Retrieve (set) information about RDD * ( DBENTRYP_RSLV ) hb_fptRddInfo */ -static ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +static HB_ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { LPDBFDATA pData; @@ -5090,7 +5090,7 @@ static ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P return SUPER_RDDINFO( pRDD, uiIndex, ulConnect, pItem ); } - return SUCCESS; + return HB_SUCCESS; } HB_FUNC( DBFDBT ) {;} @@ -5111,18 +5111,18 @@ static void hb_dbffptRegisterRDD( USHORT * pusRddId ) if( pTable ) { - ERRCODE errCode; + HB_ERRCODE errCode; if( uiCount ) * uiCount = RDDFUNCSCOUNT; errCode = hb_rddInherit( pTable, &fptTable, &fptSuper, "DBF" ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) *pusRddId = uiRddId; hb_retni( errCode ); } else - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } HB_FUNC( DBFFPT_GETFUNCTABLE ) diff --git a/harbour/source/rdd/dbfnsx/dbfnsx1.c b/harbour/source/rdd/dbfnsx/dbfnsx1.c index 038838141e..47b14eec6e 100644 --- a/harbour/source/rdd/dbfnsx/dbfnsx1.c +++ b/harbour/source/rdd/dbfnsx/dbfnsx1.c @@ -468,12 +468,12 @@ static USHORT hb_nsxLeafPutKey( LPTAGINFO pTag, LPPAGEINFO pPage, USHORT uiOffse /* * generate Run-Time error */ -static ERRCODE hb_nsxErrorRT( NSXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, +static HB_ERRCODE hb_nsxErrorRT( NSXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, const char * szFileName, USHORT uiOsCode, USHORT uiFlags, PHB_ITEM * pErrorPtr ) { PHB_ITEM pError; - ERRCODE iRet = FAILURE; + HB_ERRCODE iRet = HB_FAILURE; if( hb_vmRequestQuery() == 0 ) { @@ -1033,7 +1033,7 @@ static BOOL hb_nsxCheckRecordScope( NSXAREAP pArea, ULONG ulRec ) { LONG lRecNo = ( LONG ) ulRec; - if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == SUCCESS && lRecNo == 0 ) + if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == HB_SUCCESS && lRecNo == 0 ) { return FALSE; } @@ -1703,10 +1703,10 @@ static void hb_nsxTagDelete( LPTAGINFO pTag ) /* * add tag to compund index */ -static ERRCODE hb_nsxTagAdd( LPNSXINDEX pIndex, LPTAGINFO pTag ) +static HB_ERRCODE hb_nsxTagAdd( LPNSXINDEX pIndex, LPTAGINFO pTag ) { if( pIndex->iTags >= NSX_MAXTAGS ) - return FAILURE; + return HB_FAILURE; if( pIndex->iTags ) pIndex->lpTags = ( LPTAGINFO * ) hb_xrealloc( pIndex->lpTags, @@ -1716,7 +1716,7 @@ static ERRCODE hb_nsxTagAdd( LPNSXINDEX pIndex, LPTAGINFO pTag ) pIndex->lpTags[ pIndex->iTags++ ] = pTag; pIndex->pArea->fSetTagNumbers = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* @@ -1740,14 +1740,14 @@ static LPTAGINFO hb_nsxTagLoad( LPNSXINDEX pIndex, ULONG ulBlock, uiKeySize == 0 || uiKeySize > NSX_MAXKEYLEN || lpNSX->KeyExpr[0] < 0x20 ) return NULL; - if( SELF_COMPILE( ( AREAP ) pIndex->pArea, lpNSX->KeyExpr ) == FAILURE ) + if( SELF_COMPILE( ( AREAP ) pIndex->pArea, lpNSX->KeyExpr ) == HB_FAILURE ) return NULL; pKeyExp = pIndex->pArea->valResult; pIndex->pArea->valResult = NULL; if( lpNSX->ForExpr[0] >= 0x20 ) { - if( SELF_COMPILE( ( AREAP ) pIndex->pArea, lpNSX->ForExpr ) == FAILURE ) + if( SELF_COMPILE( ( AREAP ) pIndex->pArea, lpNSX->ForExpr ) == HB_FAILURE ) { hb_vmDestroyBlockOrMacro( pKeyExp ); return NULL; @@ -1834,7 +1834,7 @@ static ULONG hb_nsxIndexTagFind( LPNSXROOTHEADER lpNSX, const char * szTagName ) /* * Write tag header */ -static ERRCODE hb_nsxTagHeaderSave( LPTAGINFO pTag ) +static HB_ERRCODE hb_nsxTagHeaderSave( LPTAGINFO pTag ) { LPNSXINDEX pIndex = pTag->pIndex; NSXTAGHEADER Header; @@ -1844,7 +1844,7 @@ static ERRCODE hb_nsxTagHeaderSave( LPTAGINFO pTag ) { pTag->HeadBlock = hb_nsxPageGetFree( pTag ); if( !pTag->HeadBlock ) - return FAILURE; + return HB_FAILURE; hb_nsxIndexTagAdd( pIndex, pTag ); } @@ -1883,12 +1883,12 @@ static ERRCODE hb_nsxTagHeaderSave( LPTAGINFO pTag ) } if( !hb_nsxBlockWrite( pIndex, pTag->HeadBlock, ( BYTE * ) &Header, iSize ) ) - return FAILURE; + return HB_FAILURE; pTag->HdrChanged = FALSE; pIndex->Changed = pIndex->fFlush = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* @@ -1938,7 +1938,7 @@ static void hb_nsxIndexFree( LPNSXINDEX pIndex ) /* * Write tag header */ -static ERRCODE hb_nsxIndexHeaderSave( LPNSXINDEX pIndex ) +static HB_ERRCODE hb_nsxIndexHeaderSave( LPNSXINDEX pIndex ) { int iSize = pIndex->Update ? NSX_PAGELEN : 14; @@ -1953,17 +1953,17 @@ static ERRCODE hb_nsxIndexHeaderSave( LPNSXINDEX pIndex ) HB_PUT_LE_UINT32( pIndex->HeaderBuff.FileSize, pIndex->FileSize ); if( !hb_nsxBlockWrite( pIndex, 0, ( BYTE * ) &pIndex->HeaderBuff, iSize ) ) - return FAILURE; + return HB_FAILURE; pIndex->Changed = pIndex->Update = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * load new tags from index file */ -static ERRCODE hb_nsxIndexLoad( LPNSXINDEX pIndex ) +static HB_ERRCODE hb_nsxIndexLoad( LPNSXINDEX pIndex ) { LPTAGINFO pTag; BYTE signature; @@ -1971,7 +1971,7 @@ static ERRCODE hb_nsxIndexLoad( LPNSXINDEX pIndex ) if( !pIndex->fValidHeader ) { if( !hb_nsxBlockRead( pIndex, 0, ( BYTE * ) &pIndex->HeaderBuff, NSX_PAGELEN ) ) - return FAILURE; + return HB_FAILURE; pIndex->fValidHeader = TRUE; } @@ -1980,7 +1980,7 @@ static ERRCODE hb_nsxIndexLoad( LPNSXINDEX pIndex ) pIndex->HeaderBuff.IndexFlags[0] != 0 ) { hb_nsxCorruptError( pIndex ); - return FAILURE; + return HB_FAILURE; } else { @@ -1990,7 +1990,7 @@ static ERRCODE hb_nsxIndexLoad( LPNSXINDEX pIndex ) ULONG ulBlock; if( iTags > NSX_MAXTAGS ) - return FAILURE; + return HB_FAILURE; pIndex->LargeFile = signature == NSX_SIGNATURE_LARGE; pIndex->Version = HB_GET_LE_UINT16( pIndex->HeaderBuff.Version ); @@ -2001,34 +2001,34 @@ static ERRCODE hb_nsxIndexLoad( LPNSXINDEX pIndex ) { ulBlock = HB_GET_LE_UINT32( pTagItem->TagOffset ); if( ulBlock == 0 || pTagItem->TagName[ 0 ] <= 0x20 ) - return FAILURE; + return HB_FAILURE; if( !hb_nsxBlockRead( pIndex, ulBlock, ( BYTE * ) &tagbuffer, sizeof( NSXTAGHEADER ) ) ) - return FAILURE; + return HB_FAILURE; pTag = hb_nsxTagLoad( pIndex, ulBlock, ( const char * ) pTagItem->TagName, &tagbuffer ); if( !pTag ) - return FAILURE; + return HB_FAILURE; hb_nsxTagAdd( pIndex, pTag ); } } - return SUCCESS; + return HB_SUCCESS; } /* * read index header and check for concurrent access */ -static ERRCODE hb_nsxIndexHeaderRead( LPNSXINDEX pIndex ) +static HB_ERRCODE hb_nsxIndexHeaderRead( LPNSXINDEX pIndex ) { if( !hb_nsxBlockRead( pIndex, 0, ( BYTE * ) &pIndex->HeaderBuff, NSX_PAGELEN ) ) - return FAILURE; + return HB_FAILURE; if( pIndex->HeaderBuff.Signature[0] != ( pIndex->LargeFile ? NSX_SIGNATURE_LARGE : NSX_SIGNATURE ) || pIndex->HeaderBuff.IndexFlags[0] != 0 ) { hb_nsxCorruptError( pIndex ); - return FAILURE; + return HB_FAILURE; } else { @@ -2057,7 +2057,7 @@ static ERRCODE hb_nsxIndexHeaderRead( LPNSXINDEX pIndex ) } } - return SUCCESS; + return HB_SUCCESS; } /* @@ -2111,7 +2111,7 @@ static BOOL hb_nsxIndexLockRead( LPNSXINDEX pIndex ) if( fOK ) { pIndex->lockRead++; - if( hb_nsxIndexHeaderRead( pIndex ) != SUCCESS ) + if( hb_nsxIndexHeaderRead( pIndex ) != HB_SUCCESS ) { pIndex->lockRead--; hb_dbfLockIdxFile( pIndex->pFile, pIndex->pArea->bLockType, @@ -2154,7 +2154,7 @@ static BOOL hb_nsxIndexLockWrite( LPNSXINDEX pIndex, BOOL fCheck ) if( fOK ) { pIndex->lockWrite++; - if( fCheck && hb_nsxIndexHeaderRead( pIndex ) != SUCCESS ) + if( fCheck && hb_nsxIndexHeaderRead( pIndex ) != HB_SUCCESS ) { pIndex->lockWrite--; hb_dbfLockIdxFile( pIndex->pFile, pIndex->pArea->bLockType, @@ -2561,7 +2561,7 @@ static BOOL hb_nsxTagNextKey( LPTAGINFO pTag ) pTag->stack[ iLevel ].value = ( UCHAR * ) hb_xgrab( pTag->KeyLength ); memcpy( pTag->stack[ iLevel ].value, hb_nsxGetKeyVal( pPage, pTag->KeyLength, - pTag->stack[ iLevel ].ikey ), + pTag->stack[ iLevel ].ikey ), pTag->KeyLength ); pTag->stack[ iLevel ].ikey++; break; @@ -2605,7 +2605,7 @@ static BOOL hb_nsxTagPrevKey( LPTAGINFO pTag ) pTag->stack[ iLevel ].value = ( UCHAR * ) hb_xgrab( pTag->KeyLength ); memcpy( pTag->stack[ iLevel ].value, hb_nsxGetKeyVal( pPage, pTag->KeyLength, - pTag->stack[ iLevel ].ikey - 1 ), + pTag->stack[ iLevel ].ikey - 1 ), pTag->KeyLength ); } pPage = hb_nsxPageBottomMove( pTag, ulPage ); @@ -3559,7 +3559,7 @@ static ULONG hb_nsxPageCountKeys( LPTAGINFO pTag, ULONG ulPage ) } /* - * count relative position of current location in page stack + * count relative position of current location in page stack */ static double hb_nsxTagCountRelKeyPos( LPTAGINFO pTag ) { @@ -3683,21 +3683,21 @@ static BOOL hb_nsxTagPagesFree( LPTAGINFO pTag, ULONG ulPage ) /* * free space allocated by tag */ -static ERRCODE hb_nsxTagSpaceFree( LPTAGINFO pTag ) +static HB_ERRCODE hb_nsxTagSpaceFree( LPTAGINFO pTag ) { if( hb_nsxTagHeaderCheck( pTag ) ) { if( pTag->RootBlock ) { if( ! hb_nsxTagPagesFree( pTag, pTag->RootBlock ) ) - return FAILURE; + return HB_FAILURE; } hb_nsxPageAddFree( pTag, pTag->HeadBlock ); hb_nsxIndexTagDel( pTag->pIndex, pTag->TagName ); pTag->pIndex->Changed = TRUE; } hb_nsxTagDelete( pTag ); - return SUCCESS; + return HB_SUCCESS; } /* @@ -3725,7 +3725,7 @@ static void hb_nsxCreateFName( NSXAREAP pArea, const char * szBagName, BOOL * fP DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); pExt = pExtInfo.itmResult = hb_itemPutC( NULL, "" ); - if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == SUCCESS && + if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS && hb_itemGetCLen( pExt ) > 0 ) { pFileName->szExtension = hb_itemGetCPtr( pExt ); @@ -3750,7 +3750,7 @@ static void hb_nsxCreateFName( NSXAREAP pArea, const char * szBagName, BOOL * fP DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); pExt = pExtInfo.itmResult = hb_itemPutC( NULL, "" ); - if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == SUCCESS ) + if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS ) { *fProd = hb_stricmp( pFileName->szExtension, hb_itemGetCPtr( pExt ) ) == 0; @@ -4183,7 +4183,7 @@ static BOOL hb_nsxOrdKeyGoto( LPTAGINFO pTag, ULONG ulKeyNo ) { LPTAGINFO pSavedTag = pArea->lpCurTag; pArea->lpCurTag = pTag; - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) == SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) == HB_SUCCESS ) SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); pArea->lpCurTag = pSavedTag; } @@ -4322,7 +4322,7 @@ static void hb_nsxOrdSetRelKeyPos( LPTAGINFO pTag, double dPos ) hb_nsxTagGoTop( pTag ); if( pTag->CurKeyInfo->rec != 0 ) { - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) == SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) == HB_SUCCESS ) { SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); if( pArea->fEof && !fTop ) @@ -4337,7 +4337,7 @@ static void hb_nsxOrdSetRelKeyPos( LPTAGINFO pTag, double dPos ) if( !fForward ) { hb_nsxTagGoBottom( pTag ); - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) == SUCCESS && + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) == HB_SUCCESS && pTag->CurKeyInfo->rec != 0 ) { pArea->fBottom = TRUE; @@ -4407,7 +4407,7 @@ static BOOL hb_nsxOrdSkipUnique( LPTAGINFO pTag, LONG lDir ) } hb_nsxTagUnLockRead( pTag ); - if( SELF_GOTO( ( AREAP ) pArea, fEof ? 0 : pTag->CurKeyInfo->rec ) == SUCCESS && + if( SELF_GOTO( ( AREAP ) pArea, fEof ? 0 : pTag->CurKeyInfo->rec ) == HB_SUCCESS && !fEof ) { SELF_SKIPFILTER( ( AREAP ) pArea, ( fForward || fOut ) ? 1 : -1 ); @@ -4439,7 +4439,7 @@ static BOOL hb_nsxOrdSkipEval( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pEval ) if( hb_itemType( pEval ) != HB_IT_BLOCK ) { - if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS ) + if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS ) return FALSE; return fForward ? !pArea->fEof : !pArea->fBof; } @@ -4464,12 +4464,12 @@ static BOOL hb_nsxOrdSkipEval( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pEval ) while( fForward ? !pTag->TagEOF : !pTag->TagBOF ) { - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) != HB_SUCCESS ) break; if( hb_nsxEvalSeekCond( pTag, pEval ) ) { ULONG ulRecNo = pArea->ulRecNo; - if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS || + if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS || pArea->ulRecNo == ulRecNo || hb_nsxEvalSeekCond( pTag, pEval ) ) { fFound = TRUE; @@ -4521,7 +4521,7 @@ static BOOL hb_nsxOrdSkipWild( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pWildItm if( pTag->KeyType != 'C' || !szPattern || !*szPattern ) { - if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS ) + if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS ) return FALSE; return fForward ? !pArea->fEof : !pArea->fBof; } @@ -4583,9 +4583,9 @@ static BOOL hb_nsxOrdSkipWild( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pWildItm if( hb_strMatchWild( ( const char * ) pTag->CurKeyInfo->val, szPattern ) ) { ULONG ulRecNo = pTag->CurKeyInfo->rec; - if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != HB_SUCCESS ) break; - if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS || + if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS || pArea->ulRecNo == ulRecNo || hb_strMatchWild( ( const char * ) pTag->CurKeyInfo->val, szPattern ) ) { @@ -4660,7 +4660,7 @@ static BOOL hb_nsxOrdSkipRegEx( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pRegExIt if( pTag->KeyType != 'C' || ( pRegEx = hb_regexGet( pRegExItm, 0 ) ) == NULL ) { - if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS ) + if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS ) return FALSE; return fForward ? !pArea->fEof : !pArea->fBof; } @@ -4685,13 +4685,13 @@ static BOOL hb_nsxOrdSkipRegEx( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pRegExIt while( fForward ? !pTag->TagEOF : !pTag->TagBOF ) { - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->rec ) != HB_SUCCESS ) break; if( hb_nsxRegexMatch( pTag, pRegEx, ( const char * ) pTag->CurKeyInfo->val ) ) { ULONG ulRecNo = pArea->ulRecNo; - if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS || + if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS || pArea->ulRecNo == ulRecNo || hb_nsxRegexMatch( pTag, pRegEx, ( const char * ) pTag->CurKeyInfo->val ) ) { @@ -5661,14 +5661,14 @@ static void hb_nsxSortOut( LPNSXSORTINFO pSort ) /* * create tag in index file */ -static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) +static HB_ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) { LPNSXAREA pArea = pTag->pIndex->pArea; PHB_ITEM pForItem, pWhileItem = NULL, pEvalItem = NULL, pItem = NULL; ULONG ulRecCount, ulRecNo = pArea->ulRecNo; LPNSXSORTINFO pSort; LONG lStep = 0; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; if( pArea->lpdbOrdCondInfo ) { @@ -5684,7 +5684,7 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) else { errCode = SELF_RECCOUNT( ( AREAP ) pArea, &ulRecCount ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } pArea->pSort = pSort = hb_nsxSortNew( pTag, ulRecCount ); @@ -5713,7 +5713,7 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) } else { - errCode = FAILURE; + errCode = HB_FAILURE; } } else @@ -5782,17 +5782,17 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) else { errCode = SELF_GOTO( ( AREAP ) pArea, ulStartRec ); - if( fUseFilter && errCode == SUCCESS ) + if( fUseFilter && errCode == HB_SUCCESS ) errCode = SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } ulRecNo = pArea->ulRecNo; - while( errCode == SUCCESS && !pArea->fEof ) + while( errCode == HB_SUCCESS && !pArea->fEof ) { if( hb_vmRequestQuery() != 0 ) { - errCode = FAILURE; + errCode = HB_FAILURE; break; } @@ -5816,7 +5816,7 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) } pArea->pRecord = pSort->pBuffIO + iRecBuff * pArea->uiRecordLen; pArea->ulRecNo = ulRecNo; - if( SELF_GETREC( ( AREAP ) pArea, NULL ) == FAILURE ) + if( SELF_GETREC( ( AREAP ) pArea, NULL ) == HB_FAILURE ) break; pArea->fValidBuffer = pArea->fPositioned = TRUE; pArea->fDeleted = pArea->pRecord[ 0 ] == '*'; @@ -5824,7 +5824,7 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) if( pArea->lpdbRelations ) { errCode = SELF_SYNCCHILDREN( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } iRecBuff++; @@ -5872,7 +5872,7 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) default: hb_nsxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDKEY, pTag->pIndex->IndexName, 0, 0, NULL ); - errCode = FAILURE; + errCode = HB_FAILURE; pTag->Partial = TRUE; pEvalItem = NULL; ulNextCount = 1; @@ -5902,10 +5902,10 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) if( fDirectRead ) ulRecNo++; - else if( errCode == SUCCESS ) + else if( errCode == HB_SUCCESS ) { errCode = SELF_SKIPRAW( ( AREAP ) pArea, 1 ); - if( fUseFilter && errCode == SUCCESS ) + if( fUseFilter && errCode == HB_SUCCESS ) errCode = SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); ulRecNo = pArea->ulRecNo; } @@ -5915,11 +5915,11 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) { pArea->pRecord = pSaveRecBuff; pArea->fValidBuffer = FALSE; - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_GOTO( ( AREAP ) pArea, ulRecNo ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) hb_nsxSortOut( pSort ); if( pTag->nField ) @@ -5940,14 +5940,14 @@ static ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, BOOL fReindex ) /* * recreate tags in index file */ -static ERRCODE hb_nsxReIndex( LPNSXINDEX pIndex ) +static HB_ERRCODE hb_nsxReIndex( LPNSXINDEX pIndex ) { - ERRCODE errCode = FAILURE; + HB_ERRCODE errCode = HB_FAILURE; int i; if( hb_nsxIndexLockWrite( pIndex, FALSE ) ) { - errCode = SUCCESS; + errCode = HB_SUCCESS; hb_nsxIndexTrunc( pIndex ); for( i = 0; i < pIndex->iTags; i++ ) @@ -5956,7 +5956,7 @@ static ERRCODE hb_nsxReIndex( LPNSXINDEX pIndex ) pTag->HeadBlock = pTag->RootBlock = pTag->keyCount = 0; pTag->HdrChanged = TRUE; errCode = hb_nsxTagCreate( pTag, TRUE ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } hb_nsxIndexUnLockWrite( pIndex ); @@ -5969,14 +5969,14 @@ static ERRCODE hb_nsxReIndex( LPNSXINDEX pIndex ) /* Implementation of RDD methods */ -static ERRCODE hb_nsxGoBottom( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxGoBottom( NSXAREAP pArea ) { - ERRCODE retval; + HB_ERRCODE retval; HB_TRACE(HB_TR_DEBUG, ("hb_nsxGoBottom(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( !pArea->lpCurTag ) return SUPER_GOBOTTOM( ( AREAP ) pArea ); @@ -5985,7 +5985,7 @@ static ERRCODE hb_nsxGoBottom( NSXAREAP pArea ) SELF_FORCEREL( ( AREAP ) pArea ); if( ! hb_nsxTagLockRead( pArea->lpCurTag ) ) - return FAILURE; + return HB_FAILURE; hb_nsxTagRefreshScope( pArea->lpCurTag ); hb_nsxTagGoBottom( pArea->lpCurTag ); @@ -5998,7 +5998,7 @@ static ERRCODE hb_nsxGoBottom( NSXAREAP pArea ) else { retval = SELF_GOTO( ( AREAP ) pArea, pArea->lpCurTag->CurKeyInfo->rec ); - if( retval != FAILURE && pArea->fPositioned ) + if( retval != HB_FAILURE && pArea->fPositioned ) retval = SELF_SKIPFILTER( ( AREAP ) pArea, -1 ); } hb_nsxTagUnLockRead( pArea->lpCurTag ); @@ -6006,14 +6006,14 @@ static ERRCODE hb_nsxGoBottom( NSXAREAP pArea ) return retval; } -static ERRCODE hb_nsxTop( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxTop( NSXAREAP pArea ) { - ERRCODE retval; + HB_ERRCODE retval; HB_TRACE(HB_TR_DEBUG, ("hb_nsxTop(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( !pArea->lpCurTag ) return SUPER_GOTOP( ( AREAP ) pArea ); @@ -6022,7 +6022,7 @@ static ERRCODE hb_nsxTop( NSXAREAP pArea ) SELF_FORCEREL( ( AREAP ) pArea ); if( ! hb_nsxTagLockRead( pArea->lpCurTag ) ) - return FAILURE; + return HB_FAILURE; hb_nsxTagRefreshScope( pArea->lpCurTag ); hb_nsxTagGoTop( pArea->lpCurTag ); @@ -6035,7 +6035,7 @@ static ERRCODE hb_nsxTop( NSXAREAP pArea ) else { retval = SELF_GOTO( ( AREAP ) pArea, pArea->lpCurTag->CurKeyInfo->rec ); - if( retval != FAILURE && pArea->fPositioned ) + if( retval != HB_FAILURE && pArea->fPositioned ) retval = SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } hb_nsxTagUnLockRead( pArea->lpCurTag ); @@ -6043,22 +6043,22 @@ static ERRCODE hb_nsxTop( NSXAREAP pArea ) return retval; } -static ERRCODE hb_nsxSeek( NSXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) +static HB_ERRCODE hb_nsxSeek( NSXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) { HB_TRACE(HB_TR_DEBUG, ("hb_nsxSeek(%p, %d, %p, %d)", pArea, fSoftSeek, pItem, fFindLast)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( ! pArea->lpCurTag ) { hb_nsxErrorRT( pArea, EG_NOORDER, EDBF_NOTINDEXED, NULL, 0, EF_CANDEFAULT, NULL ); - return FAILURE; + return HB_FAILURE; } else { LPKEYINFO pKey; - ERRCODE retval = SUCCESS; + HB_ERRCODE retval = HB_SUCCESS; BOOL fEOF = FALSE, fLast; USHORT uiLen; ULONG ulRec; @@ -6077,7 +6077,7 @@ static ERRCODE hb_nsxSeek( NSXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL if( ! hb_nsxTagLockRead( pArea->lpCurTag ) ) { hb_nsxKeyFree( pKey ); - return FAILURE; + return HB_FAILURE; } hb_nsxTagRefreshScope( pArea->lpCurTag ); @@ -6104,10 +6104,10 @@ static ERRCODE hb_nsxSeek( NSXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL if( !fEOF ) { retval = SELF_GOTO( ( AREAP ) pArea, pArea->lpCurTag->CurKeyInfo->rec ); - if( retval != FAILURE && pArea->fPositioned ) + if( retval != HB_FAILURE && pArea->fPositioned ) { retval = SELF_SKIPFILTER( ( AREAP ) pArea, fFindLast ? -1 : 1 ); - if( retval != FAILURE && ulRec && pArea->fPositioned ) + if( retval != HB_FAILURE && ulRec && pArea->fPositioned ) { pArea->fFound = ( ulRec == pArea->ulRecNo || hb_nsxValCompare( pArea->lpCurTag, pKey->val, uiLen, @@ -6118,7 +6118,7 @@ static ERRCODE hb_nsxSeek( NSXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL } } } - if( retval != FAILURE && ( fEOF || + if( retval != HB_FAILURE && ( fEOF || !hb_nsxKeyInScope( pArea->lpCurTag, pArea->lpCurTag->CurKeyInfo ) ) ) { retval = SELF_GOTO( ( AREAP ) pArea, 0 ); @@ -6130,21 +6130,21 @@ static ERRCODE hb_nsxSeek( NSXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL } } -static ERRCODE hb_nsxSkipRaw( NSXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_nsxSkipRaw( NSXAREAP pArea, LONG lToSkip ) { - ERRCODE retval; + HB_ERRCODE retval; BOOL fOut = FALSE, fForward; HB_TRACE(HB_TR_DEBUG, ("hb_nsxSkipRaw(%p, %ld)", pArea, lToSkip)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( ! pArea->lpCurTag || lToSkip == 0 ) return SUPER_SKIPRAW( ( AREAP ) pArea, lToSkip ); if( ! hb_nsxTagLockRead( pArea->lpCurTag ) ) - return FAILURE; + return HB_FAILURE; hb_nsxTagRefreshScope( pArea->lpCurTag ); fForward = ( lToSkip > 0 ); @@ -6201,14 +6201,14 @@ static ERRCODE hb_nsxSkipRaw( NSXAREAP pArea, LONG lToSkip ) /* * Flush _system_ buffers to disk */ -static ERRCODE hb_nsxFlush( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxFlush( NSXAREAP pArea ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_nsxFlush(%p)", pArea)); uiError = SELF_GOCOLD( ( AREAP ) pArea ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { uiError = SUPER_FLUSH( ( AREAP ) pArea ); @@ -6233,14 +6233,14 @@ static ERRCODE hb_nsxFlush( NSXAREAP pArea ) /* * Perform a write of WorkArea memory to the data store. */ -static ERRCODE hb_nsxGoCold( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxGoCold( NSXAREAP pArea ) { BOOL fRecordChanged = pArea->fRecordChanged; BOOL fAppend = pArea->fAppend; HB_TRACE(HB_TR_DEBUG, ("hb_nsxGoCold(%p)", pArea)); - if( SUPER_GOCOLD( ( AREAP ) pArea ) == SUCCESS ) + if( SUPER_GOCOLD( ( AREAP ) pArea ) == HB_SUCCESS ) { if( fRecordChanged || pArea->fIdxAppend ) { @@ -6354,22 +6354,22 @@ static ERRCODE hb_nsxGoCold( NSXAREAP pArea ) pArea->lpdbPendingRel = lpdbPendingRel; } } - return SUCCESS; + return HB_SUCCESS; } - return FAILURE; + return HB_FAILURE; } /* * Mark the WorkArea data buffer as hot. */ -static ERRCODE hb_nsxGoHot( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxGoHot( NSXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_nsxGoHot(%p)", pArea)); errCode = SUPER_GOHOT( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( !pArea->fIdxAppend ) { @@ -6395,7 +6395,7 @@ static ERRCODE hb_nsxGoHot( NSXAREAP pArea ) pIndex = pIndex->pNext; } } - return SUCCESS; + return HB_SUCCESS; } return errCode; } @@ -6403,18 +6403,18 @@ static ERRCODE hb_nsxGoHot( NSXAREAP pArea ) /* * Close the table in the WorkArea. */ -static ERRCODE hb_nsxClose( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxClose( NSXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_nsxClose(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; errCode = SUPER_CLOSE( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( pArea->pSort ) { @@ -6439,21 +6439,21 @@ static ERRCODE hb_nsxClose( NSXAREAP pArea ) /* * Retrieve the size of the WorkArea structure. */ -static ERRCODE hb_nsxStructSize( NSXAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_nsxStructSize( NSXAREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("hb_nsxStructSize(%p, %p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( NSXAREA ); - return SUCCESS; + return HB_SUCCESS; } /* * Open a data store in the WorkArea. */ -static ERRCODE hb_nsxOpen( NSXAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_nsxOpen( NSXAREAP pArea, LPDBOPENINFO pOpenInfo ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_nsxOpen(%p, %p)", pArea, pOpenInfo)); @@ -6461,7 +6461,7 @@ static ERRCODE hb_nsxOpen( NSXAREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pItem = hb_itemNew( NULL ); errCode = SELF_INFO( ( AREAP ) pArea, DBI_LOCKSCHEME, pItem ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_itemRelease( pItem ); return errCode; @@ -6474,7 +6474,7 @@ static ERRCODE hb_nsxOpen( NSXAREAP pArea, LPDBOPENINFO pOpenInfo ) errCode = SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ); - if( errCode == SUCCESS && ( DBFAREA_DATA( pArea )->fStrictStruct ? + if( errCode == HB_SUCCESS && ( DBFAREA_DATA( pArea )->fStrictStruct ? pArea->fHasTags : hb_setGetAutOpen() ) ) { char szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -6490,12 +6490,12 @@ static ERRCODE hb_nsxOpen( NSXAREAP pArea, LPDBOPENINFO pOpenInfo ) pOrderInfo.itmNewVal = NULL; pOrderInfo.itmOrder = NULL; errCode = SELF_ORDLSTADD( ( AREAP ) pArea, &pOrderInfo ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pOrderInfo.itmOrder = hb_itemPutNI( NULL, hb_setGetAutOrder() ); errCode = SELF_ORDLSTFOCUS( ( AREAP ) pArea, &pOrderInfo ); hb_itemRelease( pOrderInfo.itmOrder ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_GOTOP( ( AREAP ) pArea ); } hb_itemRelease( pOrderInfo.atomBagName ); @@ -6506,32 +6506,32 @@ static ERRCODE hb_nsxOpen( NSXAREAP pArea, LPDBOPENINFO pOpenInfo ) return errCode; } -static ERRCODE hb_nsxPack( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxPack( NSXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_nsxPack(%p)", pArea )); errCode = SUPER_PACK( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) return SELF_ORDLSTREBUILD( ( AREAP ) pArea ); return errCode; } -static ERRCODE hb_nsxZap( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxZap( NSXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_nsxZap(%p)", pArea )); errCode = SUPER_ZAP( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) return SELF_ORDLSTREBUILD( ( AREAP ) pArea ); return errCode; } -static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) +static HB_ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) { PHB_ITEM pResult, pKeyExp, pForExp = NULL; int iLen, iTag; @@ -6540,7 +6540,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo const char * szKey, * szFor = NULL; LPNSXINDEX pIndex, * pIndexPtr; LPTAGINFO pTag = NULL; - ERRCODE errCode; + HB_ERRCODE errCode; ULONG ulRecNo; BOOL fNewFile, fProd, fLocked = FALSE, fAscend = TRUE, fCustom = FALSE, fTemporary = FALSE, fExclusive = FALSE; @@ -6549,13 +6549,13 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderCreate(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( pArea->lpdbPendingRel ) { errCode = SELF_FORCEREL( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } @@ -6566,7 +6566,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo else /* Otherwise, try compiling the key expression string */ { errCode = SELF_COMPILE( ( AREAP ) pArea, ( BYTE * ) szKey ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; pKeyExp = pArea->valResult; pArea->valResult = NULL; @@ -6575,11 +6575,11 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo /* Get a blank record before testing expression */ ulRecNo = pArea->ulRecNo; errCode = SELF_GOTO( ( AREAP ) pArea, 0 ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; errCode = SELF_EVALBLOCK( ( AREAP ) pArea, pKeyExp ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); @@ -6618,7 +6618,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo SELF_GOTO( ( AREAP ) pArea, ulRecNo ); hb_nsxErrorRT( pArea, bType == 'U' ? EG_DATATYPE : EG_DATAWIDTH, 1026, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbOrdCondInfo ) @@ -6636,7 +6636,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo { /* Otherwise, try compiling the conditional expression string */ errCode = SELF_COMPILE( ( AREAP ) pArea, ( BYTE * ) szFor ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); @@ -6653,7 +6653,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo BOOL fOK; errCode = SELF_EVALBLOCK( ( AREAP ) pArea, pForExp ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_vmDestroyBlockOrMacro( pKeyExp ); hb_vmDestroyBlockOrMacro( pForExp ); @@ -6669,7 +6669,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo hb_vmDestroyBlockOrMacro( pForExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); hb_nsxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDFOR, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } } @@ -6697,7 +6697,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo if( pForExp != NULL ) hb_vmDestroyBlockOrMacro( pForExp ); hb_nsxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #if 0 /* enable this code if you want to forbid tag deleting in shared mode */ else if( pIndex->fShared ) @@ -6706,7 +6706,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo if( pForExp != NULL ) hb_vmDestroyBlockOrMacro( pForExp ); hb_nsxErrorRT( pArea, EG_SHARED, EDBF_SHARED, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #endif } @@ -6753,7 +6753,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo if( pForExp != NULL ) hb_vmDestroyBlockOrMacro( pForExp ); /* hb_nsxSetTagNumbers() */ - return FAILURE; + return HB_FAILURE; } pIndex = hb_nsxIndexNew( pArea ); @@ -6770,16 +6770,16 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo if( !fNewFile ) { if( !hb_nsxIndexLockWrite( pIndex, TRUE ) ) - errCode = FAILURE; + errCode = HB_FAILURE; else { errCode = hb_nsxIndexLoad( pIndex ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) hb_nsxIndexUnLockWrite( pIndex ); else fLocked = TRUE; } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_nsxIndexFree( pIndex ); hb_vmDestroyBlockOrMacro( pKeyExp ); @@ -6803,11 +6803,11 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo if( !fLocked && !hb_nsxIndexLockWrite( pIndex, !fNewFile ) ) { - errCode = FAILURE; + errCode = HB_FAILURE; } iTag = hb_nsxFindTagByName( pIndex, szTagName ); - if( errCode == SUCCESS && iTag == 0 && pIndex->iTags == NSX_MAXTAGS ) + if( errCode == HB_SUCCESS && iTag == 0 && pIndex->iTags == NSX_MAXTAGS ) { hb_nsxIndexUnLockWrite( pIndex ); hb_vmDestroyBlockOrMacro( pKeyExp ); @@ -6815,10 +6815,10 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo hb_vmDestroyBlockOrMacro( pForExp ); /* hb_nsxSetTagNumbers() */ hb_nsxErrorRT( pArea, EG_LIMIT, EDBF_LIMITEXCEEDED, pIndex->IndexName, 0, 0, NULL ); - errCode = FAILURE; + errCode = HB_FAILURE; } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pTag = hb_nsxTagNew( pIndex, szTagName, szKey, pKeyExp, bType, (USHORT) iLen, bTrail, @@ -6841,7 +6841,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ! hb_nsxTagPagesFree( pIndex->lpTags[ iTag - 1 ], pIndex->lpTags[ iTag - 1 ]->RootBlock ) ) { - errCode = FAILURE; + errCode = HB_FAILURE; } else { @@ -6855,7 +6855,7 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo hb_nsxIndexTagAdd( pIndex, pTag ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pIndex->Update = pIndex->Changed = pTag->HdrChanged = TRUE; errCode = hb_nsxTagCreate( pTag, FALSE ); @@ -6869,9 +6869,9 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo /* It should not happen, reintrance? */ if( !*pIndexPtr ) - return FAILURE; + return HB_FAILURE; - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { /* TODO: free only new indexes */ *pIndexPtr = pIndex->pNext; @@ -6903,20 +6903,20 @@ static ERRCODE hb_nsxOrderCreate( NSXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo return SELF_GOTOP( ( AREAP ) pArea ); } -static ERRCODE hb_nsxOrderDestroy( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_nsxOrderDestroy( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderDestroy(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( pArea->lpdbPendingRel ) { errCode = SELF_FORCEREL( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } @@ -6948,18 +6948,18 @@ static ERRCODE hb_nsxOrderDestroy( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) else if( pIndex->fReadonly ) { hb_nsxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #if 0 /* enable this code if you want to forbid tag deleting in shared mode */ else if( pIndex->fShared ) { hb_nsxErrorRT( pArea, EG_SHARED, EDBF_SHARED, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #endif else if( !hb_nsxIndexLockWrite( pIndex, TRUE ) ) { - return FAILURE; + return HB_FAILURE; } else { @@ -6973,7 +6973,7 @@ static ERRCODE hb_nsxOrderDestroy( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) return errCode; } -static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) +static HB_ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) { LPTAGINFO pTag; HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderInfo(%p, %hu, %p)", pArea, uiIndex, pInfo)); @@ -7019,23 +7019,23 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI case DBOI_EVALSTEP: pInfo->itmResult = hb_itemPutNL( pInfo->itmResult, pArea->lpdbOrdCondInfo ? pArea->lpdbOrdCondInfo->lStep : 0 ); - return SUCCESS; + return HB_SUCCESS; case DBOI_KEYSINCLUDED: pInfo->itmResult = hb_itemPutNL( pInfo->itmResult, pArea->pSort ? pArea->pSort->ulTotKeys : 0 ); - return SUCCESS; + return HB_SUCCESS; case DBOI_I_TAGNAME: pInfo->itmResult = hb_itemPutC( pInfo->itmResult, pArea->pSort ? pArea->pSort->pTag->TagName : NULL ); - return SUCCESS; + return HB_SUCCESS; case DBOI_I_BAGNAME: pInfo->itmResult = hb_itemPutC( pInfo->itmResult, pArea->pSort ? pArea->pSort->pTag->pIndex->IndexName : NULL ); - return SUCCESS; + return HB_SUCCESS; case DBOI_ISREINDEX: pInfo->itmResult = hb_itemPutL( pInfo->itmResult, pArea->pSort ? pArea->pSort->fReindex : FALSE ); - return SUCCESS; + return HB_SUCCESS; case DBOI_LOCKOFFSET: case DBOI_HPLOCKING: { @@ -7045,7 +7045,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI pInfo->itmResult = hb_itemPutNInt( pInfo->itmResult, ulPos ); else pInfo->itmResult = hb_itemPutL( pInfo->itmResult, ulPool > 0 ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_ORDERCOUNT: { @@ -7061,7 +7061,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI i = hb_nsxTagCount( pArea ); pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, i ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGCOUNT: { @@ -7073,7 +7073,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI pIndex = pIndex->pNext; } pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, i ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGNUMBER: { @@ -7098,7 +7098,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI while( pIndex ); } pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, pIndex ? i : 0 ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGORDER: { @@ -7124,12 +7124,12 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI while( pIndex ); } pInfo->itmResult = hb_itemPutNI( pInfo->itmResult, pIndex ? i : 0 ); - return SUCCESS; + return HB_SUCCESS; } } - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pTag = hb_nsxFindTag( pArea, pInfo->itmOrder, pInfo->atomBagName ); @@ -7151,11 +7151,11 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI BOOL fOK = *szForExpr == 0; if( !fOK ) { - if( SELF_COMPILE( ( AREAP ) pArea, ( BYTE *) szForExpr ) == SUCCESS ) + if( SELF_COMPILE( ( AREAP ) pArea, ( BYTE *) szForExpr ) == HB_SUCCESS ) { pForItem = pArea->valResult; pArea->valResult = NULL; - if( SELF_EVALBLOCK( ( AREAP ) pArea, pForItem ) == SUCCESS ) + if( SELF_EVALBLOCK( ( AREAP ) pArea, pForItem ) == HB_SUCCESS ) { fOK = hb_itemType( pArea->valResult ) == HB_IT_LOGICAL; hb_itemRelease( pArea->valResult ); @@ -7359,7 +7359,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI if( pTag->pIndex->fReadonly ) { hb_nsxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pTag->pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pTag->Custom ) { @@ -7369,14 +7369,14 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI else { hb_nsxErrorRT( pArea, 0, 1052, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } break; case DBOI_KEYDELETE: if( pTag->pIndex->fReadonly ) { hb_nsxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pTag->pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pTag->Custom ) { @@ -7386,7 +7386,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI else { hb_nsxErrorRT( pArea, 0, 1052, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } break; case DBOI_KEYTYPE: @@ -7518,7 +7518,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI /* case DBOI_RECNO: */ if( pInfo->itmNewVal && hb_itemType( pInfo->itmNewVal ) & HB_IT_NUMERIC ) hb_itemPutL( pInfo->itmResult, SELF_GOTO( ( AREAP ) pArea, - hb_itemGetNL( pInfo->itmNewVal ) ) == SUCCESS ); + hb_itemGetNL( pInfo->itmNewVal ) ) == HB_SUCCESS ); else SELF_RECID( ( AREAP ) pArea, pInfo->itmResult ); break; @@ -7543,8 +7543,8 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI ulRecNo = ( ULONG ) dPos * ulRecCount + 1; if( ulRecNo >= ulRecCount ) ulRecNo = ulRecCount; - if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) == SUCCESS && - SELF_SKIPFILTER( ( AREAP ) pArea, 1 ) == SUCCESS && + if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) == HB_SUCCESS && + SELF_SKIPFILTER( ( AREAP ) pArea, 1 ) == HB_SUCCESS && pArea->fEof ) SELF_GOTOP( ( AREAP ) pArea ); } @@ -7555,7 +7555,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI ULONG ulRecNo = 0, ulRecCount = 0; double dPos = 0.0; /* resolve any pending relations */ - if( SELF_RECNO( ( AREAP ) pArea, &ulRecNo ) == SUCCESS ) + if( SELF_RECNO( ( AREAP ) pArea, &ulRecNo ) == HB_SUCCESS ) { if( !pArea->fPositioned ) { @@ -7574,7 +7574,7 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI break; case DBOI_SKIPUNIQUE: hb_itemPutL( pInfo->itmResult, SELF_SKIP( ( AREAP ) pArea, - hb_itemGetNL( pInfo->itmNewVal ) >= 0 ? 1 : -1 ) == SUCCESS ); + hb_itemGetNL( pInfo->itmNewVal ) >= 0 ? 1 : -1 ) == HB_SUCCESS ); break; case DBOI_SKIPEVAL: case DBOI_SKIPEVALBACK: @@ -7642,36 +7642,36 @@ static ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI hb_itemClear( pInfo->itmResult ); } } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_nsxCountScope( NSXAREAP pArea, void * pPtr, LONG * plRecNo ) +static HB_ERRCODE hb_nsxCountScope( NSXAREAP pArea, void * pPtr, LONG * plRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_nsxCountScope(%p, %p, %p)", pArea, pPtr, plRecNo)); if( pPtr == NULL ) - return SUCCESS; + return HB_SUCCESS; return SUPER_COUNTSCOPE( ( AREAP ) pArea, pPtr, plRecNo ); } -static ERRCODE hb_nsxOrderListAdd( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_nsxOrderListAdd( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) { USHORT uiFlags; PHB_FILE pFile; char szFileName[ _POSIX_PATH_MAX + 1 ]; LPNSXINDEX pIndex, *pIndexPtr; - ERRCODE errCode; + HB_ERRCODE errCode; BOOL fRetry, fReadonly, fShared, fProd; HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderListAdd(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( hb_itemGetCLen( pOrderInfo->atomBagName ) == 0 ) - return FAILURE; + return HB_FAILURE; hb_nsxCreateFName( pArea, hb_itemGetCPtr( pOrderInfo->atomBagName ), &fProd, szFileName, NULL ); @@ -7704,7 +7704,7 @@ static ERRCODE hb_nsxOrderListAdd( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) hb_errRelease( pError ); if( !pFile ) - return FAILURE; + return HB_FAILURE; pIndex = hb_nsxIndexNew( pArea ); pIndex->IndexName = hb_strdup( szFileName ); @@ -7719,9 +7719,9 @@ static ERRCODE hb_nsxOrderListAdd( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) hb_nsxIndexUnLockRead( pIndex ); } else - errCode = FAILURE; + errCode = HB_FAILURE; - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_nsxIndexFree( pIndex ); hb_nsxErrorRT( pArea, EG_CORRUPTION, EDBF_CORRUPT, szFileName, 0, 0, NULL ); @@ -7743,14 +7743,14 @@ static ERRCODE hb_nsxOrderListAdd( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) return errCode; } -static ERRCODE hb_nsxOrderListClear( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxOrderListClear( NSXAREAP pArea ) { LPNSXINDEX *pIndexPtr, pIndex; HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderListClear(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pArea->lpCurTag = NULL; pIndexPtr = &pArea->lpIndexes; @@ -7769,10 +7769,10 @@ static ERRCODE hb_nsxOrderListClear( NSXAREAP pArea ) } } /* hb_nsxSetTagNumbers() */ - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_nsxOrderListDelete( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_nsxOrderListDelete( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) { char szTagName[ NSX_TAGNAME + 1 ]; char szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -7781,8 +7781,8 @@ static ERRCODE hb_nsxOrderListDelete( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderListDelete(%p, %p)", pArea, pOrderInfo)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; hb_nsxCreateFName( pArea, hb_itemGetCPtr( pOrderInfo->atomBagName ), &fProd, szFileName, szTagName ); @@ -7805,10 +7805,10 @@ static ERRCODE hb_nsxOrderListDelete( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) pIndexPtr = &(*pIndexPtr)->pNext; } } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_nsxOrderListFocus( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_nsxOrderListFocus( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderListFocus(%p, %p)", pArea, pOrderInfo)); @@ -7818,7 +7818,7 @@ static ERRCODE hb_nsxOrderListFocus( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) if( pOrderInfo->itmOrder ) { /* - * In Clipper 5.3 DBFCDX (COMIX) when bad name or order is given + * In Clipper 5.3 DBFCDX (COMIX) when bad name or order is given * tag number is set to 0 (natural record order). CL52 RDDs and * SIX3 drivers do not change order in such case. * I'd like to keep the same behavior in all native [x]Harbour @@ -7835,47 +7835,47 @@ static ERRCODE hb_nsxOrderListFocus( NSXAREAP pArea, LPDBORDERINFO pOrderInfo ) #endif } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_nsxOrderListRebuild( NSXAREAP pArea ) +static HB_ERRCODE hb_nsxOrderListRebuild( NSXAREAP pArea ) { LPTAGINFO pCurrTag; LPNSXINDEX pIndex; - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_nsxOrderListRebuild(%p)", pArea)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( pArea->fShared ) { hb_nsxErrorRT( pArea, EG_SHARED, EDBF_SHARED, pArea->szDataFileName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pArea->fReadonly ) { hb_nsxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pArea->szDataFileName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbPendingRel ) { errCode = SELF_FORCEREL( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } pCurrTag = pArea->lpCurTag; pArea->lpCurTag = NULL; pIndex = pArea->lpIndexes; - while( pIndex && errCode == SUCCESS ) + while( pIndex && errCode == HB_SUCCESS ) { errCode = hb_nsxReIndex( pIndex ); pIndex = pIndex->pNext; } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pArea->lpCurTag = pCurrTag; errCode = SELF_GOTOP( ( AREAP ) pArea ); @@ -7883,7 +7883,7 @@ static ERRCODE hb_nsxOrderListRebuild( NSXAREAP pArea ) return errCode; } -static ERRCODE hb_nsxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +static HB_ERRCODE hb_nsxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { LPDBFDATA pData; @@ -7941,7 +7941,7 @@ static ERRCODE hb_nsxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P return SUPER_RDDINFO( pRDD, uiIndex, ulConnect, pItem ); } - return SUCCESS; + return HB_SUCCESS; } static const RDDFUNCS nsxTable = { @@ -8059,14 +8059,14 @@ HB_FUNC( DBFNSX_GETFUNCTABLE ) if( pTable ) { - ERRCODE errCode; + HB_ERRCODE errCode; if( uiCount ) * uiCount = RDDFUNCSCOUNT; errCode = hb_rddInherit( pTable, &nsxTable, &nsxSuper, "DBFFPT" ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) errCode = hb_rddInherit( pTable, &nsxTable, &nsxSuper, "DBF" ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { /* * we successfully register our RDD so now we can initialize it @@ -8078,7 +8078,7 @@ HB_FUNC( DBFNSX_GETFUNCTABLE ) } else { - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index 3b458a431c..bb62a253a0 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -249,12 +249,12 @@ static ULONG hb_ntxGetKeyRec( LPPAGEINFO pPage, SHORT iKey ) /* * generate Run-Time error */ -static ERRCODE hb_ntxErrorRT( NTXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, +static HB_ERRCODE hb_ntxErrorRT( NTXAREAP pArea, USHORT uiGenCode, USHORT uiSubCode, const char * szFileName, USHORT uiOsCode, USHORT uiFlags, PHB_ITEM * pErrorPtr ) { PHB_ITEM pError; - ERRCODE iRet = FAILURE; + HB_ERRCODE iRet = HB_FAILURE; if( hb_vmRequestQuery() == 0 ) { @@ -850,7 +850,7 @@ static BOOL hb_ntxCheckRecordScope( NTXAREAP pArea, ULONG ulRec ) { LONG lRecNo = ( LONG ) ulRec; - if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == SUCCESS && lRecNo == 0 ) + if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == HB_SUCCESS && lRecNo == 0 ) { return FALSE; } @@ -1490,10 +1490,10 @@ static void hb_ntxTagDelete( LPTAGINFO pTag ) /* * add tag to compund index */ -static ERRCODE hb_ntxTagAdd( LPNTXINDEX pIndex, LPTAGINFO pTag ) +static HB_ERRCODE hb_ntxTagAdd( LPNTXINDEX pIndex, LPTAGINFO pTag ) { if( pIndex->iTags >= CTX_MAX_TAGS ) - return FAILURE; + return HB_FAILURE; if( pIndex->iTags ) pIndex->lpTags = ( LPTAGINFO * ) hb_xrealloc( pIndex->lpTags, @@ -1503,7 +1503,7 @@ static ERRCODE hb_ntxTagAdd( LPNTXINDEX pIndex, LPTAGINFO pTag ) pIndex->lpTags[ pIndex->iTags++ ] = pTag; pIndex->Owner->fSetTagNumbers = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* @@ -1526,14 +1526,14 @@ static LPTAGINFO hb_ntxTagLoad( LPNTXINDEX pIndex, ULONG ulBlock, lpNTX->key_expr[0] < 0x20 ) return NULL; - if( SELF_COMPILE( ( AREAP ) pIndex->Owner, lpNTX->key_expr ) == FAILURE ) + if( SELF_COMPILE( ( AREAP ) pIndex->Owner, lpNTX->key_expr ) == HB_FAILURE ) return NULL; pKeyExp = pIndex->Owner->valResult; pIndex->Owner->valResult = NULL; if( usType & NTX_FLAG_FORITEM && lpNTX->for_expr[0] >= 0x20 ) { - if( SELF_COMPILE( ( AREAP ) pIndex->Owner, lpNTX->for_expr ) == FAILURE ) + if( SELF_COMPILE( ( AREAP ) pIndex->Owner, lpNTX->for_expr ) == HB_FAILURE ) { hb_vmDestroyBlockOrMacro( pKeyExp ); return NULL; @@ -1656,7 +1656,7 @@ static ULONG hb_ntxIndexTagFind( LPCTXHEADER lpCTX, char * szTagName ) /* * Write tag header */ -static ERRCODE hb_ntxTagHeaderSave( LPTAGINFO pTag ) +static HB_ERRCODE hb_ntxTagHeaderSave( LPTAGINFO pTag ) { LPNTXINDEX pIndex = pTag->Owner; NTXHEADER Header; @@ -1669,7 +1669,7 @@ static ERRCODE hb_ntxTagHeaderSave( LPTAGINFO pTag ) { pTag->HeadBlock = hb_ntxPageGetFree( pTag ); if( !pTag->HeadBlock ) - return FAILURE; + return HB_FAILURE; hb_ntxIndexTagAdd( pIndex, pTag ); } } @@ -1738,11 +1738,11 @@ static ERRCODE hb_ntxTagHeaderSave( LPTAGINFO pTag ) } if( !hb_ntxBlockWrite( pIndex, pTag->HeadBlock, ( BYTE * ) &Header, iSize ) ) - return FAILURE; + return HB_FAILURE; pTag->HdrChanged = FALSE; pIndex->Changed = pIndex->Compound; pIndex->fFlush = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* @@ -1794,7 +1794,7 @@ static void hb_ntxIndexFree( LPNTXINDEX pIndex ) /* * Write tag header */ -static ERRCODE hb_ntxIndexHeaderSave( LPNTXINDEX pIndex ) +static HB_ERRCODE hb_ntxIndexHeaderSave( LPNTXINDEX pIndex ) { if( pIndex->Compound ) { @@ -1812,16 +1812,16 @@ static ERRCODE hb_ntxIndexHeaderSave( LPNTXINDEX pIndex ) HB_PUT_LE_UINT32( lpCTX->filesize, pIndex->TagBlock ); if( !hb_ntxBlockWrite( pIndex, 0, ( BYTE * ) lpCTX, iSize ) ) - return FAILURE; + return HB_FAILURE; } pIndex->Changed = pIndex->Update = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * load new tags from index file */ -static ERRCODE hb_ntxIndexLoad( LPNTXINDEX pIndex, char * szTagName ) +static HB_ERRCODE hb_ntxIndexLoad( LPNTXINDEX pIndex, char * szTagName ) { LPTAGINFO pTag; USHORT type; @@ -1831,7 +1831,7 @@ static ERRCODE hb_ntxIndexLoad( LPNTXINDEX pIndex, char * szTagName ) if( !pIndex->HeaderBuff ) pIndex->HeaderBuff = ( BYTE * ) hb_xgrab( NTXBLOCKSIZE ); if( !hb_ntxBlockRead( pIndex, 0, pIndex->HeaderBuff, NTXBLOCKSIZE ) ) - return FAILURE; + return HB_FAILURE; pIndex->fValidHeader = TRUE; } @@ -1848,7 +1848,7 @@ static ERRCODE hb_ntxIndexLoad( LPNTXINDEX pIndex, char * szTagName ) iTags = HB_GET_LE_UINT16( lpCTX->ntags ); if( iTags > CTX_MAX_TAGS ) - return FAILURE; + return HB_FAILURE; pIndex->Version = HB_GET_LE_UINT32( lpCTX->version ); pIndex->NextAvail = HB_GET_LE_UINT32( lpCTX->freepage ); pIndex->TagBlock = HB_GET_LE_UINT32( lpCTX->filesize ); @@ -1858,12 +1858,12 @@ static ERRCODE hb_ntxIndexLoad( LPNTXINDEX pIndex, char * szTagName ) { ulBlock = HB_GET_LE_UINT32( pTagItem->tag_header ); if( ulBlock == 0 || pTagItem->tag_name[ 0 ] <= 0x20 ) - return FAILURE; + return HB_FAILURE; if( !hb_ntxBlockRead( pIndex, ulBlock, tagbuffer, NTXBLOCKSIZE ) ) - return FAILURE; + return HB_FAILURE; pTag = hb_ntxTagLoad( pIndex, ulBlock, ( char * ) pTagItem->tag_name, tagbuffer ); if( !pTag ) - return FAILURE; + return HB_FAILURE; hb_ntxTagAdd( pIndex, pTag ); } } @@ -1872,17 +1872,17 @@ static ERRCODE hb_ntxIndexLoad( LPNTXINDEX pIndex, char * szTagName ) { pTag = hb_ntxTagLoad( pIndex, 0, szTagName, pIndex->HeaderBuff ); if( !pTag ) - return FAILURE; + return HB_FAILURE; hb_ntxTagAdd( pIndex, pTag ); } - return SUCCESS; + return HB_SUCCESS; } /* * read index header and check for concurrent access */ -static ERRCODE hb_ntxIndexHeaderRead( LPNTXINDEX pIndex ) +static HB_ERRCODE hb_ntxIndexHeaderRead( LPNTXINDEX pIndex ) { USHORT type; @@ -1890,7 +1890,7 @@ static ERRCODE hb_ntxIndexHeaderRead( LPNTXINDEX pIndex ) pIndex->HeaderBuff = ( BYTE * ) hb_xgrab( NTXBLOCKSIZE ); if( !hb_ntxBlockRead( pIndex, 0, pIndex->HeaderBuff, NTXBLOCKSIZE ) ) - return FAILURE; + return HB_FAILURE; type = HB_GET_LE_UINT16( pIndex->HeaderBuff ); if( ( type & NTX_FLAG_COMPOUND ) != 0 ) @@ -1898,7 +1898,7 @@ static ERRCODE hb_ntxIndexHeaderRead( LPNTXINDEX pIndex ) #if defined( HB_NTX_NOMULTITAG ) hb_ntxErrorRT( pIndex->Owner, EG_CORRUPTION, EDBF_CORRUPT, pIndex->IndexName, hb_fsError(), 0, NULL ); - return FAILURE; + return HB_FAILURE; #else LPCTXHEADER lpCTX = ( LPCTXHEADER ) pIndex->HeaderBuff; ULONG ulVersion, ulNext; @@ -1936,7 +1936,7 @@ static ERRCODE hb_ntxIndexHeaderRead( LPNTXINDEX pIndex ) { hb_ntxErrorRT( pIndex->Owner, EG_CORRUPTION, EDBF_CORRUPT, pIndex->IndexName, hb_fsError(), 0, NULL ); - return FAILURE; + return HB_FAILURE; } pTag = pIndex->iTags ? pIndex->lpTags[0] : NULL; @@ -1956,7 +1956,7 @@ static ERRCODE hb_ntxIndexHeaderRead( LPNTXINDEX pIndex ) } } } - return SUCCESS; + return HB_SUCCESS; } /* @@ -2019,7 +2019,7 @@ static BOOL hb_ntxIndexLockRead( LPNTXINDEX pIndex ) if( fOK ) { pIndex->lockRead++; - if( hb_ntxIndexHeaderRead( pIndex ) != SUCCESS ) + if( hb_ntxIndexHeaderRead( pIndex ) != HB_SUCCESS ) { pIndex->lockRead--; hb_dbfLockIdxFile( pIndex->DiskFile, pIndex->Owner->bLockType, @@ -2063,7 +2063,7 @@ static BOOL hb_ntxIndexLockWrite( LPNTXINDEX pIndex, BOOL fCheck ) if( fOK ) { pIndex->lockWrite++; - if( fCheck && hb_ntxIndexHeaderRead( pIndex ) != SUCCESS ) + if( fCheck && hb_ntxIndexHeaderRead( pIndex ) != HB_SUCCESS ) { pIndex->lockWrite--; hb_dbfLockIdxFile( pIndex->DiskFile, pIndex->Owner->bLockType, @@ -3374,7 +3374,7 @@ static ULONG hb_ntxPageCountKeys( LPTAGINFO pTag, ULONG ulPage ) } /* - * count relative position of current location in page stack + * count relative position of current location in page stack */ static double hb_ntxTagCountRelKeyPos( LPTAGINFO pTag ) { @@ -3480,21 +3480,21 @@ static BOOL hb_ntxTagPagesFree( LPTAGINFO pTag, ULONG ulPage ) /* * free space allocated by tag */ -static ERRCODE hb_ntxTagSpaceFree( LPTAGINFO pTag ) +static HB_ERRCODE hb_ntxTagSpaceFree( LPTAGINFO pTag ) { if( hb_ntxTagHeaderCheck( pTag ) ) { if( pTag->RootBlock ) { if( ! hb_ntxTagPagesFree( pTag, pTag->RootBlock ) ) - return FAILURE; + return HB_FAILURE; } hb_ntxPageAddFree( pTag, pTag->HeadBlock ); hb_ntxIndexTagDel( pTag->Owner, pTag->TagName ); pTag->Owner->Changed = TRUE; } hb_ntxTagDelete( pTag ); - return SUCCESS; + return HB_SUCCESS; } /* @@ -3522,7 +3522,7 @@ static void hb_ntxCreateFName( NTXAREAP pArea, char * szBagName, BOOL * fProd, DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); pExt = pExtInfo.itmResult = hb_itemPutC( NULL, NULL ); - if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == SUCCESS && + if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS && hb_itemGetCLen( pExt ) > 0 ) { pFileName->szExtension = hb_itemGetCPtr( pExt ); @@ -3547,7 +3547,7 @@ static void hb_ntxCreateFName( NTXAREAP pArea, char * szBagName, BOOL * fProd, DBORDERINFO pExtInfo; memset( &pExtInfo, 0, sizeof( pExtInfo ) ); pExt = pExtInfo.itmResult = hb_itemPutC( NULL, NULL ); - if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == SUCCESS ) + if( SELF_ORDINFO( ( AREAP ) pArea, DBOI_BAGEXT, &pExtInfo ) == HB_SUCCESS ) { *fProd = hb_stricmp( pFileName->szExtension, hb_itemGetCPtr( pExt ) ) == 0; @@ -3854,7 +3854,7 @@ static BOOL hb_ntxOrdKeyGoto( LPTAGINFO pTag, ULONG ulKeyNo ) { LPTAGINFO pSavedTag = pArea->lpCurTag; pArea->lpCurTag = pTag; - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) == SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) == HB_SUCCESS ) SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); pArea->lpCurTag = pSavedTag; } @@ -3993,7 +3993,7 @@ static void hb_ntxOrdSetRelKeyPos( LPTAGINFO pTag, double dPos ) hb_ntxTagGoTop( pTag ); if( pTag->CurKeyInfo->Xtra != 0 ) { - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) == SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) == HB_SUCCESS ) { SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); if( pArea->fEof && !fTop ) @@ -4008,7 +4008,7 @@ static void hb_ntxOrdSetRelKeyPos( LPTAGINFO pTag, double dPos ) if( !fForward ) { hb_ntxTagGoBottom( pTag ); - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) == SUCCESS && + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) == HB_SUCCESS && pTag->CurKeyInfo->Xtra != 0 ) { pArea->fBottom = TRUE; @@ -4078,7 +4078,7 @@ static BOOL hb_ntxOrdSkipUnique( LPTAGINFO pTag, LONG lDir ) } hb_ntxTagUnLockRead( pTag ); - if( SELF_GOTO( ( AREAP ) pArea, fEof ? 0 : pTag->CurKeyInfo->Xtra ) == SUCCESS && + if( SELF_GOTO( ( AREAP ) pArea, fEof ? 0 : pTag->CurKeyInfo->Xtra ) == HB_SUCCESS && !fEof ) { SELF_SKIPFILTER( ( AREAP ) pArea, ( fForward || fOut ) ? 1 : -1 ); @@ -4110,7 +4110,7 @@ static BOOL hb_ntxOrdSkipEval( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pEval ) if( hb_itemType( pEval ) != HB_IT_BLOCK ) { - if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS ) + if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS ) return FALSE; return fForward ? !pArea->fEof : !pArea->fBof; } @@ -4135,12 +4135,12 @@ static BOOL hb_ntxOrdSkipEval( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pEval ) while( fForward ? !pTag->TagEOF : !pTag->TagBOF ) { - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) != HB_SUCCESS ) break; if( hb_ntxEvalSeekCond( pTag, pEval ) ) { ULONG ulRecNo = pArea->ulRecNo; - if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS || + if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS || pArea->ulRecNo == ulRecNo || hb_ntxEvalSeekCond( pTag, pEval ) ) { fFound = TRUE; @@ -4192,7 +4192,7 @@ static BOOL hb_ntxOrdSkipWild( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pWildItm if( pTag->KeyType != 'C' || !szPattern || !*szPattern ) { - if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS ) + if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS ) return FALSE; return fForward ? !pArea->fEof : !pArea->fBof; } @@ -4255,9 +4255,9 @@ static BOOL hb_ntxOrdSkipWild( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pWildItm if( hb_strMatchWild( pTag->CurKeyInfo->key, szPattern ) ) { ULONG ulRecNo = pTag->CurKeyInfo->Xtra; - if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) != HB_SUCCESS ) break; - if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS || + if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS || pArea->ulRecNo == ulRecNo || hb_strMatchWild( pTag->CurKeyInfo->key, szPattern ) ) { @@ -4332,7 +4332,7 @@ static BOOL hb_ntxOrdSkipRegEx( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pRegExIt if( pTag->KeyType != 'C' || ( pRegEx = hb_regexGet( pRegExItm, 0 ) ) == NULL ) { - if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS ) + if( SELF_SKIP( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS ) return FALSE; return fForward ? !pArea->fEof : !pArea->fBof; } @@ -4357,13 +4357,13 @@ static BOOL hb_ntxOrdSkipRegEx( LPTAGINFO pTag, BOOL fForward, PHB_ITEM pRegExIt while( fForward ? !pTag->TagEOF : !pTag->TagBOF ) { - if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) != SUCCESS ) + if( SELF_GOTO( ( AREAP ) pArea, pTag->CurKeyInfo->Xtra ) != HB_SUCCESS ) break; if( hb_ntxRegexMatch( pTag, pRegEx, ( char * ) pTag->CurKeyInfo->key ) ) { ULONG ulRecNo = pArea->ulRecNo; - if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != SUCCESS || + if( SELF_SKIPFILTER( ( AREAP ) pArea, fForward ? 1 : -1 ) != HB_SUCCESS || pArea->ulRecNo == ulRecNo || hb_ntxRegexMatch( pTag, pRegEx, ( char * ) pTag->CurKeyInfo->key ) ) { @@ -5239,14 +5239,14 @@ static void hb_ntxSortOut( LPNTXSORTINFO pSort ) /* * create tag in index file */ -static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) +static HB_ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) { LPNTXAREA pArea = pTag->Owner->Owner; PHB_ITEM pForItem, pWhileItem = NULL, pEvalItem = NULL, pItem = NULL; ULONG ulRecCount, ulRecNo = pArea->ulRecNo; LPNTXSORTINFO pSort; LONG lStep = 0; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; if( pArea->lpdbOrdCondInfo ) { @@ -5262,7 +5262,7 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) else { errCode = SELF_RECCOUNT( ( AREAP ) pArea, &ulRecCount ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } pArea->pSort = pSort = hb_ntxSortNew( pTag, ulRecCount ); @@ -5279,7 +5279,7 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) } else { - errCode = FAILURE; + errCode = HB_FAILURE; } } else @@ -5347,17 +5347,17 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) else { errCode = SELF_GOTO( ( AREAP ) pArea, ulStartRec ); - if( fUseFilter && errCode == SUCCESS ) + if( fUseFilter && errCode == HB_SUCCESS ) errCode = SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } ulRecNo = pArea->ulRecNo; - while( errCode == SUCCESS && !pArea->fEof ) + while( errCode == HB_SUCCESS && !pArea->fEof ) { if( hb_vmRequestQuery() != 0 ) { - errCode = FAILURE; + errCode = HB_FAILURE; break; } @@ -5381,7 +5381,7 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) } pArea->pRecord = pSort->pBuffIO + iRecBuff * pArea->uiRecordLen; pArea->ulRecNo = ulRecNo; - if( SELF_GETREC( ( AREAP ) pArea, NULL ) == FAILURE ) + if( SELF_GETREC( ( AREAP ) pArea, NULL ) == HB_FAILURE ) break; pArea->fValidBuffer = pArea->fPositioned = TRUE; pArea->fDeleted = pArea->pRecord[ 0 ] == '*'; @@ -5389,7 +5389,7 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) if( pArea->lpdbRelations ) { errCode = SELF_SYNCCHILDREN( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } iRecBuff++; @@ -5435,7 +5435,7 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) default: hb_ntxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDKEY, pTag->Owner->IndexName, 0, 0, NULL ); - errCode = FAILURE; + errCode = HB_FAILURE; pTag->Partial = TRUE; pEvalItem = NULL; ulNextCount = 1; @@ -5465,10 +5465,10 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) if( fDirectRead ) ulRecNo++; - else if( errCode == SUCCESS ) + else if( errCode == HB_SUCCESS ) { errCode = SELF_SKIPRAW( ( AREAP ) pArea, 1 ); - if( fUseFilter && errCode == SUCCESS ) + if( fUseFilter && errCode == HB_SUCCESS ) errCode = SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); ulRecNo = pArea->ulRecNo; } @@ -5478,11 +5478,11 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) { pArea->pRecord = pSaveRecBuff; pArea->fValidBuffer = FALSE; - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_GOTO( ( AREAP ) pArea, ulRecNo ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) hb_ntxSortOut( pSort ); if( pTag->nField ) @@ -5503,14 +5503,14 @@ static ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, BOOL fReindex ) /* * recreate tags in index file */ -static ERRCODE hb_ntxReIndex( LPNTXINDEX pIndex ) +static HB_ERRCODE hb_ntxReIndex( LPNTXINDEX pIndex ) { - ERRCODE errCode = FAILURE; + HB_ERRCODE errCode = HB_FAILURE; int i; if( hb_ntxIndexLockWrite( pIndex, FALSE ) ) { - errCode = SUCCESS; + errCode = HB_SUCCESS; hb_ntxIndexTrunc( pIndex ); for( i = 0; i < pIndex->iTags; i++ ) @@ -5519,7 +5519,7 @@ static ERRCODE hb_ntxReIndex( LPNTXINDEX pIndex ) pTag->HeadBlock = pTag->RootBlock = pTag->keyCount = 0; pTag->HdrChanged = TRUE; errCode = hb_ntxTagCreate( pTag, TRUE ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } hb_ntxIndexUnLockWrite( pIndex ); @@ -5532,14 +5532,14 @@ static ERRCODE hb_ntxReIndex( LPNTXINDEX pIndex ) /* Implementation of exported functions */ -static ERRCODE ntxGoBottom( NTXAREAP pArea ) +static HB_ERRCODE ntxGoBottom( NTXAREAP pArea ) { - ERRCODE retval; + HB_ERRCODE retval; HB_TRACE(HB_TR_DEBUG, ("ntxGoBottom(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( !pArea->lpCurTag ) return SUPER_GOBOTTOM( ( AREAP ) pArea ); @@ -5548,7 +5548,7 @@ static ERRCODE ntxGoBottom( NTXAREAP pArea ) SELF_FORCEREL( ( AREAP ) pArea ); if( ! hb_ntxTagLockRead( pArea->lpCurTag ) ) - return FAILURE; + return HB_FAILURE; hb_ntxTagRefreshScope( pArea->lpCurTag ); hb_ntxTagGoBottom( pArea->lpCurTag ); @@ -5561,7 +5561,7 @@ static ERRCODE ntxGoBottom( NTXAREAP pArea ) else { retval = SELF_GOTO( ( AREAP ) pArea, pArea->lpCurTag->CurKeyInfo->Xtra ); - if( retval != FAILURE && pArea->fPositioned ) + if( retval != HB_FAILURE && pArea->fPositioned ) retval = SELF_SKIPFILTER( ( AREAP ) pArea, -1 ); } hb_ntxTagUnLockRead( pArea->lpCurTag ); @@ -5569,14 +5569,14 @@ static ERRCODE ntxGoBottom( NTXAREAP pArea ) return retval; } -static ERRCODE ntxGoTop( NTXAREAP pArea ) +static HB_ERRCODE ntxGoTop( NTXAREAP pArea ) { - ERRCODE retval; + HB_ERRCODE retval; HB_TRACE(HB_TR_DEBUG, ("ntxGoTop(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( !pArea->lpCurTag ) return SUPER_GOTOP( ( AREAP ) pArea ); @@ -5585,7 +5585,7 @@ static ERRCODE ntxGoTop( NTXAREAP pArea ) SELF_FORCEREL( ( AREAP ) pArea ); if( ! hb_ntxTagLockRead( pArea->lpCurTag ) ) - return FAILURE; + return HB_FAILURE; hb_ntxTagRefreshScope( pArea->lpCurTag ); hb_ntxTagGoTop( pArea->lpCurTag ); @@ -5598,7 +5598,7 @@ static ERRCODE ntxGoTop( NTXAREAP pArea ) else { retval = SELF_GOTO( ( AREAP ) pArea, pArea->lpCurTag->CurKeyInfo->Xtra ); - if( retval != FAILURE && pArea->fPositioned ) + if( retval != HB_FAILURE && pArea->fPositioned ) retval = SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } hb_ntxTagUnLockRead( pArea->lpCurTag ); @@ -5606,22 +5606,22 @@ static ERRCODE ntxGoTop( NTXAREAP pArea ) return retval; } -static ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) +static HB_ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) { HB_TRACE(HB_TR_DEBUG, ("ntxSeek(%p, %d, %p, %d)", pArea, fSoftSeek, pItem, fFindLast)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( ! pArea->lpCurTag ) { hb_ntxErrorRT( pArea, EG_NOORDER, EDBF_NOTINDEXED, NULL, 0, EF_CANDEFAULT, NULL ); - return FAILURE; + return HB_FAILURE; } else { LPKEYINFO pKey; - ERRCODE retval = SUCCESS; + HB_ERRCODE retval = HB_SUCCESS; BOOL fEOF = FALSE, fLast; USHORT uiLen; ULONG ulRec; @@ -5641,7 +5641,7 @@ static ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFi if( ! hb_ntxTagLockRead( pArea->lpCurTag ) ) { hb_ntxKeyFree( pKey ); - return FAILURE; + return HB_FAILURE; } hb_ntxTagRefreshScope( pArea->lpCurTag ); @@ -5668,10 +5668,10 @@ static ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFi if( !fEOF ) { retval = SELF_GOTO( ( AREAP ) pArea, pArea->lpCurTag->CurKeyInfo->Xtra ); - if( retval != FAILURE && pArea->fPositioned ) + if( retval != HB_FAILURE && pArea->fPositioned ) { retval = SELF_SKIPFILTER( ( AREAP ) pArea, fFindLast ? -1 : 1 ); - if( retval != FAILURE && ulRec && pArea->fPositioned ) + if( retval != HB_FAILURE && ulRec && pArea->fPositioned ) { pArea->fFound = ( ulRec == pArea->ulRecNo || hb_ntxValCompare( pArea->lpCurTag, pKey->key, uiLen, @@ -5682,7 +5682,7 @@ static ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFi } } } - if( retval != FAILURE && ( fEOF || + if( retval != HB_FAILURE && ( fEOF || !hb_ntxKeyInScope( pArea->lpCurTag, pArea->lpCurTag->CurKeyInfo ) ) ) { retval = SELF_GOTO( ( AREAP ) pArea, 0 ); @@ -5694,21 +5694,21 @@ static ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFi } } -static ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ) { - ERRCODE retval; + HB_ERRCODE retval; BOOL fOut = FALSE, fForward; HB_TRACE(HB_TR_DEBUG, ("ntxSkipRaw(%p, %ld)", pArea, lToSkip)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; if( ! pArea->lpCurTag || lToSkip == 0 ) return SUPER_SKIPRAW( ( AREAP ) pArea, lToSkip ); if( ! hb_ntxTagLockRead( pArea->lpCurTag ) ) - return FAILURE; + return HB_FAILURE; hb_ntxTagRefreshScope( pArea->lpCurTag ); fForward = ( lToSkip > 0 ); @@ -5765,14 +5765,14 @@ static ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ) /* * Flush _system_ buffers to disk */ -static ERRCODE ntxFlush( NTXAREAP pArea ) +static HB_ERRCODE ntxFlush( NTXAREAP pArea ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("ntxFlush(%p)", pArea)); uiError = SELF_GOCOLD( ( AREAP ) pArea ); - if( uiError == SUCCESS ) + if( uiError == HB_SUCCESS ) { uiError = SUPER_FLUSH( ( AREAP ) pArea ); @@ -5797,14 +5797,14 @@ static ERRCODE ntxFlush( NTXAREAP pArea ) /* * Perform a write of WorkArea memory to the data store. */ -static ERRCODE ntxGoCold( NTXAREAP pArea ) +static HB_ERRCODE ntxGoCold( NTXAREAP pArea ) { BOOL fRecordChanged = pArea->fRecordChanged; BOOL fAppend = pArea->fAppend; HB_TRACE(HB_TR_DEBUG, ("ntxGoCold(%p)", pArea)); - if( SUPER_GOCOLD( ( AREAP ) pArea ) == SUCCESS ) + if( SUPER_GOCOLD( ( AREAP ) pArea ) == HB_SUCCESS ) { if( fRecordChanged || pArea->fNtxAppend ) { @@ -5922,22 +5922,22 @@ static ERRCODE ntxGoCold( NTXAREAP pArea ) pArea->lpdbPendingRel = lpdbPendingRel; } } - return SUCCESS; + return HB_SUCCESS; } - return FAILURE; + return HB_FAILURE; } /* * Mark the WorkArea data buffer as hot. */ -static ERRCODE ntxGoHot( NTXAREAP pArea ) +static HB_ERRCODE ntxGoHot( NTXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxGoHot(%p)", pArea)); errCode = SUPER_GOHOT( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( !pArea->fNtxAppend ) { @@ -5963,7 +5963,7 @@ static ERRCODE ntxGoHot( NTXAREAP pArea ) pIndex = pIndex->pNext; } } - return SUCCESS; + return HB_SUCCESS; } return errCode; } @@ -5971,18 +5971,18 @@ static ERRCODE ntxGoHot( NTXAREAP pArea ) /* * Close the table in the WorkArea. */ -static ERRCODE ntxClose( NTXAREAP pArea ) +static HB_ERRCODE ntxClose( NTXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxClose(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; errCode = SUPER_CLOSE( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( pArea->pSort ) { @@ -6011,28 +6011,28 @@ static ERRCODE ntxClose( NTXAREAP pArea ) /* * Retrieve the size of the WorkArea structure. */ -static ERRCODE ntxStructSize( NTXAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE ntxStructSize( NTXAREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("ntxStructSize(%p, %p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( NTXAREA ); - return SUCCESS; + return HB_SUCCESS; } /* * Open a data store in the WorkArea. */ -static ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxOpen(%p, %p)", pArea, pOpenInfo)); errCode = SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ); - if( errCode == SUCCESS && DBFAREA_DATA( pArea )->fStruct && + if( errCode == HB_SUCCESS && DBFAREA_DATA( pArea )->fStruct && ( DBFAREA_DATA( pArea )->fStrictStruct ? pArea->fHasTags : hb_setGetAutOpen() ) ) { char szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -6048,12 +6048,12 @@ static ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ) pOrderInfo.itmNewVal = NULL; pOrderInfo.itmOrder = NULL; errCode = SELF_ORDLSTADD( ( AREAP ) pArea, &pOrderInfo ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pOrderInfo.itmOrder = hb_itemPutNI( NULL, hb_setGetAutOrder() ); errCode = SELF_ORDLSTFOCUS( ( AREAP ) pArea, &pOrderInfo ); hb_itemRelease( pOrderInfo.itmOrder ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_GOTOP( ( AREAP ) pArea ); } hb_itemRelease( pOrderInfo.atomBagName ); @@ -6064,32 +6064,32 @@ static ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ) return errCode; } -static ERRCODE ntxPack( NTXAREAP pArea ) +static HB_ERRCODE ntxPack( NTXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxPack(%p)", pArea )); errCode = SUPER_PACK( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) return SELF_ORDLSTREBUILD( ( AREAP ) pArea ); return errCode; } -static ERRCODE ntxZap( NTXAREAP pArea ) +static HB_ERRCODE ntxZap( NTXAREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxZap(%p)", pArea )); errCode = SUPER_ZAP( ( AREAP ) pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) return SELF_ORDLSTREBUILD( ( AREAP ) pArea ); return errCode; } -static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) +static HB_ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) { PHB_ITEM pResult, pKeyExp, pForExp = NULL; int iLen, iDec, iTag, i; @@ -6098,7 +6098,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) LPNTXINDEX pIndex, * pIndexPtr; LPTAGINFO pTag = NULL; LPDBFDATA pData; - ERRCODE errCode; + HB_ERRCODE errCode; ULONG ulRecNo; BOOL fCompound, fTagName, fBagName, fProd, fLocked = FALSE, fAscend = TRUE, fCustom = FALSE, fTemporary = FALSE, fExclusive = FALSE; @@ -6107,13 +6107,13 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) HB_TRACE(HB_TR_DEBUG, ("ntxOrderCreate(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( pArea->lpdbPendingRel ) { errCode = SELF_FORCEREL( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } @@ -6124,7 +6124,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) else /* Otherwise, try compiling the key expression string */ { errCode = SELF_COMPILE( ( AREAP ) pArea, ( BYTE * ) szKey ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; pKeyExp = pArea->valResult; pArea->valResult = NULL; @@ -6133,11 +6133,11 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) /* Get a blank record before testing expression */ ulRecNo = pArea->ulRecNo; errCode = SELF_GOTO( ( AREAP ) pArea, 0 ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; errCode = SELF_EVALBLOCK( ( AREAP ) pArea, pKeyExp ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); @@ -6178,7 +6178,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) SELF_GOTO( ( AREAP ) pArea, ulRecNo ); hb_ntxErrorRT( pArea, bType == 'U' ? EG_DATATYPE : EG_DATAWIDTH, 1026, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbOrdCondInfo ) @@ -6196,7 +6196,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) { /* Otherwise, try compiling the conditional expression string */ errCode = SELF_COMPILE( ( AREAP ) pArea, ( BYTE * ) szFor ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_vmDestroyBlockOrMacro( pKeyExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); @@ -6213,7 +6213,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) BOOL fOK; errCode = SELF_EVALBLOCK( ( AREAP ) pArea, pForExp ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_vmDestroyBlockOrMacro( pKeyExp ); hb_vmDestroyBlockOrMacro( pForExp ); @@ -6229,7 +6229,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) hb_vmDestroyBlockOrMacro( pForExp ); SELF_GOTO( ( AREAP ) pArea, ulRecNo ); hb_ntxErrorRT( pArea, EG_DATATYPE, EDBF_INVALIDFOR, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } } @@ -6283,7 +6283,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) if( pForExp != NULL ) hb_vmDestroyBlockOrMacro( pForExp ); hb_ntxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #if 0 /* enable this code if you want to forbid tag deleting in shared mode */ else if( pIndex->fShared ) @@ -6292,7 +6292,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) if( pForExp != NULL ) hb_vmDestroyBlockOrMacro( pForExp ); hb_ntxErrorRT( pArea, EG_SHARED, EDBF_SHARED, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #endif } @@ -6340,7 +6340,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) if( pForExp != NULL ) hb_vmDestroyBlockOrMacro( pForExp ); /* hb_ntxSetTagNumbers() */ - return FAILURE; + return HB_FAILURE; } pIndex = hb_ntxIndexNew( pArea ); @@ -6361,16 +6361,16 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) if( fOld ) { if( !hb_ntxIndexLockWrite( pIndex, TRUE ) ) - errCode = FAILURE; + errCode = HB_FAILURE; else { errCode = hb_ntxIndexLoad( pIndex, szTagName ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) hb_ntxIndexUnLockWrite( pIndex ); else fLocked = TRUE; } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { *pIndexPtr = pIndex->pNext; hb_ntxIndexFree( pIndex ); @@ -6400,12 +6400,12 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) hb_vmDestroyBlockOrMacro( pForExp ); /* hb_ntxSetTagNumbers() */ hb_ntxErrorRT( pArea, EG_LIMIT, EDBF_LIMITEXCEEDED, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( !fLocked && !hb_ntxIndexLockWrite( pIndex, fCompound ) ) { - errCode = FAILURE; + errCode = HB_FAILURE; } else { @@ -6448,7 +6448,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) ! hb_ntxTagPagesFree( pIndex->lpTags[ iTag - 1 ], pIndex->lpTags[ iTag - 1 ]->RootBlock ) ) { - errCode = FAILURE; + errCode = HB_FAILURE; } else { @@ -6463,7 +6463,7 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) hb_ntxIndexTagAdd( pIndex, pTag ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pIndex->Update = pIndex->Changed = pTag->HdrChanged = TRUE; errCode = hb_ntxTagCreate( pTag, FALSE ); @@ -6477,9 +6477,9 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) /* It should not happen, reintrance? */ if( !*pIndexPtr ) - return FAILURE; + return HB_FAILURE; - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { *pIndexPtr = pIndex->pNext; hb_ntxIndexFree( pIndex ); @@ -6510,20 +6510,20 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) return SELF_GOTOP( ( AREAP ) pArea ); } -static ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxOrderDestroy(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( pArea->lpdbPendingRel ) { errCode = SELF_FORCEREL( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } @@ -6556,18 +6556,18 @@ static ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) else if( pIndex->fReadonly ) { hb_ntxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #if 0 /* enable this code if you want to forbid tag deleting in shared mode */ else if( pIndex->fShared ) { hb_ntxErrorRT( pArea, EG_SHARED, EDBF_SHARED, pIndex->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } #endif else if( !hb_ntxIndexLockWrite( pIndex, TRUE ) ) { - return FAILURE; + return HB_FAILURE; } else { @@ -6581,7 +6581,7 @@ static ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) return errCode; } -static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) +static HB_ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) { LPTAGINFO pTag; HB_TRACE(HB_TR_DEBUG, ("ntxOrderInfo(%p, %hu, %p)", pArea, uiIndex, pInfo)); @@ -6609,23 +6609,23 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo case DBOI_EVALSTEP: hb_itemPutNL( pInfo->itmResult, pArea->lpdbOrdCondInfo ? pArea->lpdbOrdCondInfo->lStep : 0 ); - return SUCCESS; + return HB_SUCCESS; case DBOI_KEYSINCLUDED: hb_itemPutNL( pInfo->itmResult, pArea->pSort ? pArea->pSort->ulTotKeys : 0 ); - return SUCCESS; + return HB_SUCCESS; case DBOI_I_TAGNAME: hb_itemPutC( pInfo->itmResult, pArea->pSort ? pArea->pSort->pTag->TagName : NULL ); - return SUCCESS; + return HB_SUCCESS; case DBOI_I_BAGNAME: hb_itemPutC( pInfo->itmResult, pArea->pSort ? pArea->pSort->pTag->Owner->IndexName : NULL ); - return SUCCESS; + return HB_SUCCESS; case DBOI_ISREINDEX: hb_itemPutL( pInfo->itmResult, pArea->pSort ? pArea->pSort->fReindex : FALSE ); - return SUCCESS; + return HB_SUCCESS; case DBOI_LOCKOFFSET: case DBOI_HPLOCKING: { @@ -6635,7 +6635,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo hb_itemPutNInt( pInfo->itmResult, ulPos ); else hb_itemPutL( pInfo->itmResult, ulPool > 0 ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_ORDERCOUNT: { @@ -6652,7 +6652,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo pIndex = pIndex->pNext; } hb_itemPutNI( pInfo->itmResult, i ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGCOUNT: { @@ -6664,7 +6664,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo pIndex = pIndex->pNext; } hb_itemPutNI( pInfo->itmResult, i ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGNUMBER: { @@ -6689,7 +6689,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo while( pIndex ); } hb_itemPutNI( pInfo->itmResult, pIndex ? i : 0 ); - return SUCCESS; + return HB_SUCCESS; } case DBOI_BAGORDER: { @@ -6715,12 +6715,12 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo while( pIndex ); } hb_itemPutNI( pInfo->itmResult, pIndex ? i : 0 ); - return SUCCESS; + return HB_SUCCESS; } } - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pTag = hb_ntxFindTag( pArea, pInfo->itmOrder, pInfo->atomBagName ); @@ -6741,11 +6741,11 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo BOOL fOK = *szForExpr == 0; if( !fOK ) { - if( SELF_COMPILE( ( AREAP ) pArea, ( BYTE *) szForExpr ) == SUCCESS ) + if( SELF_COMPILE( ( AREAP ) pArea, ( BYTE *) szForExpr ) == HB_SUCCESS ) { pForItem = pArea->valResult; pArea->valResult = NULL; - if( SELF_EVALBLOCK( ( AREAP ) pArea, pForItem ) == SUCCESS ) + if( SELF_EVALBLOCK( ( AREAP ) pArea, pForItem ) == HB_SUCCESS ) { fOK = hb_itemType( pArea->valResult ) == HB_IT_LOGICAL; hb_itemRelease( pArea->valResult ); @@ -6950,7 +6950,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo { hb_ntxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pTag->Owner->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pTag->Custom ) { @@ -6960,7 +6960,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo else { hb_ntxErrorRT( pArea, 0, 1052, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } break; case DBOI_KEYDELETE: @@ -6968,7 +6968,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo { hb_ntxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pTag->Owner->IndexName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pTag->Custom ) { @@ -6978,7 +6978,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo else { hb_ntxErrorRT( pArea, 0, 1052, NULL, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } break; case DBOI_KEYTYPE: @@ -7127,7 +7127,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo /* case DBOI_RECNO: */ if( pInfo->itmNewVal && hb_itemType( pInfo->itmNewVal ) & HB_IT_NUMERIC ) hb_itemPutL( pInfo->itmResult, SELF_GOTO( ( AREAP ) pArea, - hb_itemGetNL( pInfo->itmNewVal ) ) == SUCCESS ); + hb_itemGetNL( pInfo->itmNewVal ) ) == HB_SUCCESS ); else SELF_RECID( ( AREAP ) pArea, pInfo->itmResult ); break; @@ -7152,8 +7152,8 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ulRecNo = ( ULONG ) dPos * ulRecCount + 1; if( ulRecNo >= ulRecCount ) ulRecNo = ulRecCount; - if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) == SUCCESS && - SELF_SKIPFILTER( ( AREAP ) pArea, 1 ) == SUCCESS && + if( SELF_GOTO( ( AREAP ) pArea, ulRecNo ) == HB_SUCCESS && + SELF_SKIPFILTER( ( AREAP ) pArea, 1 ) == HB_SUCCESS && pArea->fEof ) SELF_GOTOP( ( AREAP ) pArea ); } @@ -7164,7 +7164,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ULONG ulRecNo = 0, ulRecCount = 0; double dPos = 0.0; /* resolve any pending relations */ - if( SELF_RECNO( ( AREAP ) pArea, &ulRecNo ) == SUCCESS ) + if( SELF_RECNO( ( AREAP ) pArea, &ulRecNo ) == HB_SUCCESS ) { if( !pArea->fPositioned ) { @@ -7183,7 +7183,7 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo break; case DBOI_SKIPUNIQUE: hb_itemPutL( pInfo->itmResult, SELF_SKIP( ( AREAP ) pArea, - hb_itemGetNL( pInfo->itmNewVal ) >= 0 ? 1 : -1 ) == SUCCESS ); + hb_itemGetNL( pInfo->itmNewVal ) >= 0 ? 1 : -1 ) == HB_SUCCESS ); break; case DBOI_SKIPEVAL: case DBOI_SKIPEVALBACK: @@ -7251,44 +7251,44 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo hb_itemClear( pInfo->itmResult ); } } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo ) +static HB_ERRCODE ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo ) { HB_TRACE(HB_TR_DEBUG, ("ntxCountScope(%p, %p, %p)", pArea, pPtr, plRecNo)); if( pPtr == NULL ) { - return SUCCESS; + return HB_SUCCESS; } return SUPER_COUNTSCOPE( ( AREAP ) pArea, pPtr, plRecNo ); } -static ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { USHORT uiFlags; PHB_FILE pFile; char szFileName[ _POSIX_PATH_MAX + 1 ], szTagName[ NTX_MAX_TAGNAME + 1 ]; LPNTXINDEX pIndex, *pIndexPtr; - ERRCODE errCode; + HB_ERRCODE errCode; BOOL fRetry, fReadonly, fShared, fProd; HB_TRACE(HB_TR_DEBUG, ("ntxOrderListAdd(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( hb_itemGetCLen( pOrderInfo->atomBagName ) == 0 ) - return FAILURE; + return HB_FAILURE; hb_ntxCreateFName( pArea, hb_itemGetCPtr( pOrderInfo->atomBagName ), &fProd, szFileName, szTagName ); /* if( ! szTagName[0] ) - return FAILURE; + return HB_FAILURE; */ pIndex = hb_ntxFindBag( pArea, szFileName ); @@ -7320,7 +7320,7 @@ static ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) hb_errRelease( pError ); if( !pFile ) - return FAILURE; + return HB_FAILURE; pIndex = hb_ntxIndexNew( pArea ); pIndex->IndexName = hb_strdup( szFileName ); @@ -7340,9 +7340,9 @@ static ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) hb_ntxIndexUnLockRead( pIndex ); } else - errCode = FAILURE; + errCode = HB_FAILURE; - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { *pIndexPtr = pIndex->pNext; hb_ntxIndexFree( pIndex ); @@ -7360,14 +7360,14 @@ static ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) return errCode; } -static ERRCODE ntxOrderListClear( NTXAREAP pArea ) +static HB_ERRCODE ntxOrderListClear( NTXAREAP pArea ) { LPNTXINDEX *pIndexPtr, pIndex; HB_TRACE(HB_TR_DEBUG, ("ntxOrderListClear(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pArea->lpCurTag = NULL; pIndexPtr = &pArea->lpIndexes; @@ -7387,10 +7387,10 @@ static ERRCODE ntxOrderListClear( NTXAREAP pArea ) } } /* hb_ntxSetTagNumbers() */ - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { char szTagName[ NTX_MAX_TAGNAME + 1 ]; char szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -7399,8 +7399,8 @@ static ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) HB_TRACE(HB_TR_DEBUG, ("ntxOrderListDelete(%p, %p)", pArea, pOrderInfo)); - if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; hb_ntxCreateFName( pArea, hb_itemGetCPtr( pOrderInfo->atomBagName ), &fProd, szFileName, szTagName ); @@ -7423,10 +7423,10 @@ static ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) pIndexPtr = &(*pIndexPtr)->pNext; } } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { HB_TRACE(HB_TR_DEBUG, ("ntxOrderListFocus(%p, %p)", pArea, pOrderInfo)); @@ -7451,47 +7451,47 @@ static ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) #endif } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE ntxOrderListRebuild( NTXAREAP pArea ) +static HB_ERRCODE ntxOrderListRebuild( NTXAREAP pArea ) { LPTAGINFO pCurrTag; LPNTXINDEX pIndex; - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxOrderListRebuild(%p)", pArea)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( pArea->fShared ) { hb_ntxErrorRT( pArea, EG_SHARED, EDBF_SHARED, pArea->szDataFileName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pArea->fReadonly ) { hb_ntxErrorRT( pArea, EG_READONLY, EDBF_READONLY, pArea->szDataFileName, 0, 0, NULL ); - return FAILURE; + return HB_FAILURE; } if( pArea->lpdbPendingRel ) { errCode = SELF_FORCEREL( ( AREAP ) pArea ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; } pCurrTag = pArea->lpCurTag; pArea->lpCurTag = NULL; pIndex = pArea->lpIndexes; - while( pIndex && errCode == SUCCESS ) + while( pIndex && errCode == HB_SUCCESS ) { errCode = hb_ntxReIndex( pIndex ); pIndex = pIndex->pNext; } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { pArea->lpCurTag = pCurrTag; errCode = SELF_GOTOP( ( AREAP ) pArea ); @@ -7499,22 +7499,22 @@ static ERRCODE ntxOrderListRebuild( NTXAREAP pArea ) return errCode; } -static ERRCODE ntxInit( LPRDDNODE pRDD ) +static HB_ERRCODE ntxInit( LPRDDNODE pRDD ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("ntxInit(%p)", pRDD)); errCode = SUPER_INIT( pRDD ); #if !defined( HB_NTX_NOMULTITAG ) - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) DBFNODE_DATA( pRDD )->fMultiTag = TRUE; #endif return errCode; } -static ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +static HB_ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { LPDBFDATA pData; @@ -7599,7 +7599,7 @@ static ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ } - return SUCCESS; + return HB_SUCCESS; } static const RDDFUNCS ntxTable = { @@ -7717,16 +7717,16 @@ HB_FUNC( DBFNTX_GETFUNCTABLE ) if( pTable ) { - ERRCODE errCode; + HB_ERRCODE errCode; if( uiCount ) * uiCount = RDDFUNCSCOUNT; errCode = hb_rddInherit( pTable, &ntxTable, &ntxSuper, "DBFFPT" ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) errCode = hb_rddInherit( pTable, &ntxTable, &ntxSuper, "DBFDBT" ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) errCode = hb_rddInherit( pTable, &ntxTable, &ntxSuper, "DBF" ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { /* * we successfully register our RDD so now we can initialize it @@ -7738,7 +7738,7 @@ HB_FUNC( DBFNTX_GETFUNCTABLE ) } else { - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } diff --git a/harbour/source/rdd/dbsql.c b/harbour/source/rdd/dbsql.c index f941fa4157..d792a7f6b0 100644 --- a/harbour/source/rdd/dbsql.c +++ b/harbour/source/rdd/dbsql.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * Copyright 2007 Przemyslaw Czerpak * Copyright 2007 Lorenzo Fiorini @@ -236,7 +236,7 @@ static ULONG hb_db2Sql( AREAP pArea, PHB_ITEM pFields, HB_LONG llNext, BOOL fEof = TRUE; BOOL fNoFieldPassed = ( pFields == NULL || hb_arrayLen( pFields ) == 0 ); - if( SELF_FIELDCOUNT( pArea, &uiFields ) != SUCCESS ) + if( SELF_FIELDCOUNT( pArea, &uiFields ) != HB_SUCCESS ) return 0; if( fInsert && szTable ) @@ -249,17 +249,17 @@ static ULONG hb_db2Sql( AREAP pArea, PHB_ITEM pFields, HB_LONG llNext, { if( pWhile ) { - if( SELF_EVALBLOCK( pArea, pWhile ) != SUCCESS || + if( SELF_EVALBLOCK( pArea, pWhile ) != HB_SUCCESS || ! hb_itemGetL( pArea->valResult ) ) break; } - if( SELF_EOF( pArea, &fEof ) != SUCCESS || fEof ) + if( SELF_EOF( pArea, &fEof ) != HB_SUCCESS || fEof ) break; if( pFor ) { - if( SELF_EVALBLOCK( pArea, pFor ) != SUCCESS ) + if( SELF_EVALBLOCK( pArea, pFor ) != HB_SUCCESS ) break; } if( !pFor || hb_itemGetL( pArea->valResult ) ) @@ -290,7 +290,7 @@ static ULONG hb_db2Sql( AREAP pArea, PHB_ITEM pFields, HB_LONG llNext, { for( ui = 1; ui <= uiFields; ui ++ ) { - if( SELF_GETVALUE( pArea, ui, pTmp ) != SUCCESS ) + if( SELF_GETVALUE( pArea, ui, pTmp ) != HB_SUCCESS ) break; if( fWriteSep ) hb_addStrToFBuffer( pFileBuf, szSep ); @@ -310,7 +310,7 @@ static ULONG hb_db2Sql( AREAP pArea, PHB_ITEM pFields, HB_LONG llNext, fWriteSep = FALSE; } - if( SELF_SKIP( pArea, 1 ) != SUCCESS ) + if( SELF_SKIP( pArea, 1 ) != HB_SUCCESS ) break; if( ( llNext % 10000 ) == 0 ) @@ -350,7 +350,7 @@ HB_FUNC( __DBSQL ) char * szEsc = hb_parcx( 15 ); HB_LONG llNext = HB_LONG_MAX; HB_FHANDLE hFile; - ERRCODE errCode; + HB_ERRCODE errCode; if( ! szFileName ) hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); @@ -405,7 +405,7 @@ HB_FUNC( __DBSQL ) if( fAppend ) hb_fsSeekLarge( hFile, 0, FS_END ); - errCode = SUCCESS; + errCode = HB_SUCCESS; if( pRecord ) { errCode = SELF_GOTOID( pArea, pRecord ); @@ -419,7 +419,7 @@ HB_FUNC( __DBSQL ) errCode = SELF_GOTOP( pArea ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { hb_retnint( hb_db2Sql( pArea, pFields, llNext, pWhile, pFor, szDelim, szSep, szEsc, diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c index b82bdfa895..902468d9ae 100644 --- a/harbour/source/rdd/delim1.c +++ b/harbour/source/rdd/delim1.c @@ -236,7 +236,7 @@ static int hb_delimNextChar( DELIMAREAP pArea ) /* * Read record, decode it to buffer and set next record offset */ -static ERRCODE hb_delimReadRecord( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimReadRecord( DELIMAREAP pArea ) { USHORT uiField, uiLen, uiSize; HB_TYPE uiType; @@ -365,10 +365,10 @@ static ERRCODE hb_delimReadRecord( DELIMAREAP pArea ) pArea->fPositioned = TRUE; } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_delimNextRecord( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimNextRecord( DELIMAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimNextRecord(%p)", pArea)); @@ -387,7 +387,7 @@ static ERRCODE hb_delimNextRecord( DELIMAREAP pArea ) return hb_delimReadRecord( pArea ); } } - return SUCCESS; + return HB_SUCCESS; } /* @@ -397,20 +397,20 @@ static ERRCODE hb_delimNextRecord( DELIMAREAP pArea ) /* * Position cursor at the first record. */ -static ERRCODE hb_delimGoTop( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimGoTop( DELIMAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimGoTop(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->fTop = TRUE; pArea->fBottom = FALSE; pArea->ulRecordOffset = 0; pArea->ulRecNo = 1; - if( hb_delimReadRecord( pArea ) != SUCCESS ) - return FAILURE; + if( hb_delimReadRecord( pArea ) != HB_SUCCESS ) + return HB_FAILURE; return SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } @@ -418,15 +418,15 @@ static ERRCODE hb_delimGoTop( DELIMAREAP pArea ) /* * Reposition cursor, regardless of filter. */ -static ERRCODE hb_delimSkipRaw( DELIMAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_delimSkipRaw( DELIMAREAP pArea, LONG lToSkip ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimSkipRaw(%p,%ld)", pArea, lToSkip)); - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; if( lToSkip != 1 ) - return FAILURE; + return HB_FAILURE; else return hb_delimNextRecord( pArea ); } @@ -434,7 +434,7 @@ static ERRCODE hb_delimSkipRaw( DELIMAREAP pArea, LONG lToSkip ) /* * Determine deleted status for a record. */ -static ERRCODE hb_delimDeleted( DELIMAREAP pArea, BOOL * pDeleted ) +static HB_ERRCODE hb_delimDeleted( DELIMAREAP pArea, BOOL * pDeleted ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimDeleted(%p,%p)", pArea, pDeleted)); @@ -442,39 +442,39 @@ static ERRCODE hb_delimDeleted( DELIMAREAP pArea, BOOL * pDeleted ) * pDeleted = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain number of records in WorkArea. */ -static ERRCODE hb_delimRecCount( DELIMAREAP pArea, ULONG * pRecCount ) +static HB_ERRCODE hb_delimRecCount( DELIMAREAP pArea, ULONG * pRecCount ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimRecCount(%p,%p)", pArea, pRecCount)); * pRecCount = pArea->ulRecCount; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain physical row number at current WorkArea cursor position. */ -static ERRCODE hb_delimRecNo( DELIMAREAP pArea, ULONG * pulRecNo ) +static HB_ERRCODE hb_delimRecNo( DELIMAREAP pArea, ULONG * pulRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimRecNo(%p,%p)", pArea, pulRecNo)); *pulRecNo = pArea->ulRecNo; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain physical row ID at current WorkArea cursor position. */ -static ERRCODE hb_delimRecId( DELIMAREAP pArea, PHB_ITEM pRecNo ) +static HB_ERRCODE hb_delimRecId( DELIMAREAP pArea, PHB_ITEM pRecNo ) { - ERRCODE errCode; + HB_ERRCODE errCode; ULONG ulRecNo; HB_TRACE(HB_TR_DEBUG, ("hb_delimRecId(%p,%p)", pArea, pRecNo)); @@ -501,17 +501,17 @@ static ERRCODE hb_delimRecId( DELIMAREAP pArea, PHB_ITEM pRecNo ) /* * Append a record to the WorkArea. */ -static ERRCODE hb_delimAppend( DELIMAREAP pArea, BOOL fUnLockAll ) +static HB_ERRCODE hb_delimAppend( DELIMAREAP pArea, BOOL fUnLockAll ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimAppend(%p,%d)", pArea, (int) fUnLockAll)); HB_SYMBOL_UNUSED( fUnLockAll ); - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; - if( SELF_GOHOT( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOHOT( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->ulRecordOffset = pArea->ulFileSize; pArea->ulRecNo = ++pArea->ulRecCount; @@ -519,13 +519,13 @@ static ERRCODE hb_delimAppend( DELIMAREAP pArea, BOOL fUnLockAll ) pArea->fPositioned = TRUE; hb_delimClearRecordBuffer( pArea ); - return SUCCESS; + return HB_SUCCESS; } /* * Delete a record. */ -static ERRCODE hb_delimDeleteRec( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimDeleteRec( DELIMAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimDeleteRec(%p)", pArea)); @@ -537,13 +537,13 @@ static ERRCODE hb_delimDeleteRec( DELIMAREAP pArea ) hb_delimClearRecordBuffer( pArea ); } - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the current value of a field. */ -static ERRCODE hb_delimGetValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_delimGetValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { LPFIELD pField; @@ -635,32 +635,32 @@ static ERRCODE hb_delimGetValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pIte hb_errPutSubCode( pError, EDBF_DATATYPE ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Assign a value to a field. */ -static ERRCODE hb_delimPutValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_delimPutValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { char szBuffer[ 256 ]; - ERRCODE uiError; + HB_ERRCODE uiError; LPFIELD pField; USHORT uiSize; HB_TRACE(HB_TR_DEBUG, ("hb_delimPutValue(%p,%hu,%p)", pArea, uiIndex, pItem)); if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; if( !pArea->fRecordChanged ) - return FAILURE; + return HB_FAILURE; - uiError = SUCCESS; + uiError = HB_SUCCESS; --uiIndex; pField = pArea->lpFields + uiIndex; if( pField->uiType != HB_FT_MEMO && pField->uiType != HB_FT_NONE ) @@ -723,7 +723,7 @@ static ERRCODE hb_delimPutValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pIte uiError = EDBF_DATATYPE; } - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { PHB_ITEM pError= hb_errNew(); USHORT uiGenCode = uiError == EDBF_DATAWIDTH ? EG_DATAWIDTH : EDBF_DATATYPE; @@ -735,47 +735,47 @@ static ERRCODE hb_delimPutValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pIte hb_errPutFlags( pError, EF_CANDEFAULT ); uiError = SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return uiError == E_DEFAULT ? SUCCESS : FAILURE; + return uiError == E_DEFAULT ? HB_SUCCESS : HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Replace the current record. */ -static ERRCODE hb_delimPutRec( DELIMAREAP pArea, BYTE * pBuffer ) +static HB_ERRCODE hb_delimPutRec( DELIMAREAP pArea, BYTE * pBuffer ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimPutRec(%p,%p)", pArea, pBuffer)); if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; if( !pArea->fRecordChanged ) - return FAILURE; + return HB_FAILURE; /* Copy data to buffer */ memcpy( pArea->pRecord, pBuffer + 1, pArea->uiRecordLen ); - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve current record buffer */ -static ERRCODE hb_delimGetRec( DELIMAREAP pArea, BYTE ** pBufferPtr ) +static HB_ERRCODE hb_delimGetRec( DELIMAREAP pArea, BYTE ** pBufferPtr ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimGetRec(%p,%p)", pArea, pBufferPtr)); *pBufferPtr = pArea->pRecord - 1; - return SUCCESS; + return HB_SUCCESS; } /* * Copy one or more records from one WorkArea to another. */ -static ERRCODE hb_delimTrans( DELIMAREAP pArea, LPDBTRANSINFO pTransInfo ) +static HB_ERRCODE hb_delimTrans( DELIMAREAP pArea, LPDBTRANSINFO pTransInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimTrans(%p, %p)", pArea, pTransInfo)); @@ -788,10 +788,10 @@ static ERRCODE hb_delimTrans( DELIMAREAP pArea, LPDBTRANSINFO pTransInfo ) else { PHB_ITEM pPutRec = hb_itemPutL( NULL, FALSE ); - if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != HB_SUCCESS ) { hb_itemRelease( pPutRec ); - return FAILURE; + return HB_FAILURE; } if( hb_itemGetL( pPutRec ) ) pTransInfo->uiFlags |= DBTF_PUTREC; @@ -806,7 +806,7 @@ static ERRCODE hb_delimTrans( DELIMAREAP pArea, LPDBTRANSINFO pTransInfo ) /* * Perform a write of WorkArea memory to the data store. */ -static ERRCODE hb_delimGoCold( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimGoCold( DELIMAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimGoCold(%p)", pArea)); @@ -826,20 +826,20 @@ static ERRCODE hb_delimGoCold( DELIMAREAP pArea ) hb_errPutFileName( pError, pArea->szFileName ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } pArea->ulFileSize += ulSize; pArea->ulNextOffset = pArea->ulFileSize; pArea->fRecordChanged = FALSE; pArea->fFlush = TRUE; } - return SUCCESS; + return HB_SUCCESS; } /* * Mark the WorkArea data buffer as hot. */ -static ERRCODE hb_delimGoHot( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimGoHot( DELIMAREAP pArea ) { PHB_ITEM pError; @@ -853,18 +853,18 @@ static ERRCODE hb_delimGoHot( DELIMAREAP pArea ) hb_errPutSubCode( pError, EDBF_READONLY ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } pArea->fRecordChanged = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* * Write data buffer to the data store. */ -static ERRCODE hb_delimFlush( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimFlush( DELIMAREAP pArea ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_delimFlush(%p)", pArea)); @@ -886,7 +886,7 @@ static ERRCODE hb_delimFlush( DELIMAREAP pArea ) /* * Retrieve information about the current table/driver. */ -static ERRCODE hb_delimInfo( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_delimInfo( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimInfo(%p,%hu,%p)", pArea, uiIndex, pItem)); @@ -1009,13 +1009,13 @@ static ERRCODE hb_delimInfo( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) return SUPER_INFO( ( AREAP ) pArea, uiIndex, pItem ); } - return SUCCESS; + return HB_SUCCESS; } /* * Add a field to the WorkArea. */ -static ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo ) +static HB_ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo ) { USHORT uiDelim = 0; @@ -1127,12 +1127,12 @@ static ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo ) /* * Establish the extent of the array of fields for a WorkArea. */ -static ERRCODE hb_delimSetFieldExtent( DELIMAREAP pArea, USHORT uiFieldExtent ) +static HB_ERRCODE hb_delimSetFieldExtent( DELIMAREAP pArea, USHORT uiFieldExtent ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimSetFieldExtent(%p,%hu)", pArea, uiFieldExtent)); - if( SUPER_SETFIELDEXTENT( ( AREAP ) pArea, uiFieldExtent ) == FAILURE ) - return FAILURE; + if( SUPER_SETFIELDEXTENT( ( AREAP ) pArea, uiFieldExtent ) == HB_FAILURE ) + return HB_FAILURE; /* Alloc field offsets array */ if( uiFieldExtent ) @@ -1141,18 +1141,18 @@ static ERRCODE hb_delimSetFieldExtent( DELIMAREAP pArea, USHORT uiFieldExtent ) memset( pArea->pFieldOffset, 0, uiFieldExtent * sizeof( USHORT ) ); } - return SUCCESS; + return HB_SUCCESS; } /* * Clear the WorkArea for use. */ -static ERRCODE hb_delimNewArea( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimNewArea( DELIMAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimNewArea(%p)", pArea)); - if( SUPER_NEW( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SUPER_NEW( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pArea->pFile = NULL; pArea->fTransRec = TRUE; @@ -1165,25 +1165,25 @@ static ERRCODE hb_delimNewArea( DELIMAREAP pArea ) /* set field separator */ pArea->cSeparator = ','; - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve the size of the WorkArea structure. */ -static ERRCODE hb_delimStructSize( DELIMAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_delimStructSize( DELIMAREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimStrucSize(%p,%p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( DELIMAREA ); - return SUCCESS; + return HB_SUCCESS; } /* * Close the table in the WorkArea. */ -static ERRCODE hb_delimClose( DELIMAREAP pArea ) +static HB_ERRCODE hb_delimClose( DELIMAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimClose(%p)", pArea)); @@ -1223,17 +1223,17 @@ static ERRCODE hb_delimClose( DELIMAREAP pArea ) pArea->szFileName = NULL; } - return SUCCESS; + return HB_SUCCESS; } /* * Create a data store in the specified WorkArea. */ -static ERRCODE hb_delimCreate( DELIMAREAP pArea, LPDBOPENINFO pCreateInfo ) +static HB_ERRCODE hb_delimCreate( DELIMAREAP pArea, LPDBOPENINFO pCreateInfo ) { PHB_ITEM pError = NULL; PHB_FNAME pFileName; - ERRCODE errCode; + HB_ERRCODE errCode; BOOL fRetry; BYTE szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -1297,10 +1297,10 @@ static ERRCODE hb_delimCreate( DELIMAREAP pArea, LPDBOPENINFO pCreateInfo ) hb_itemRelease( pError ); if( !pArea->pFile ) - return FAILURE; + return HB_FAILURE; errCode = SUPER_CREATE( ( AREAP ) pArea, pCreateInfo ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); return errCode; @@ -1315,11 +1315,11 @@ static ERRCODE hb_delimCreate( DELIMAREAP pArea, LPDBOPENINFO pCreateInfo ) /* * Open a data store in the WorkArea. */ -static ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pError = NULL; PHB_FNAME pFileName; - ERRCODE errCode; + HB_ERRCODE errCode; USHORT uiFlags; BOOL fRetry; BYTE szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -1395,13 +1395,13 @@ static ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo ) hb_itemRelease( pError ); if( !pArea->pFile ) - return FAILURE; + return HB_FAILURE; errCode = SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); - return FAILURE; + return HB_FAILURE; } hb_delimInitArea( pArea, ( char * ) szFileName ); @@ -1413,7 +1413,7 @@ static ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo ) /* * Retrieve information about the current driver. */ -static ERRCODE hb_delimRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +static HB_ERRCODE hb_delimRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimRddInfo(%p,%hu,%lu,%p)", pRDD, uiIndex, ulConnect, pItem)); @@ -1433,7 +1433,7 @@ static ERRCODE hb_delimRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, } - return SUCCESS; + return HB_SUCCESS; } @@ -1563,7 +1563,7 @@ HB_FUNC( DELIM_GETFUNCTABLE ) hb_retni( hb_rddInherit( pTable, &delimTable, &delimSuper, NULL ) ); } else - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } diff --git a/harbour/source/rdd/hbdbsort.c b/harbour/source/rdd/hbdbsort.c index ef6451d0fc..65a56be6df 100644 --- a/harbour/source/rdd/hbdbsort.c +++ b/harbour/source/rdd/hbdbsort.c @@ -248,8 +248,8 @@ void hb_dbQSortComplete( LPDBQUICKSORT pQuickSort ) #endif /* Append a new record and copy data */ - if( SELF_APPEND( pArea, TRUE ) == FAILURE || - SELF_PUTREC( pArea, pQuickSort->pSwapBufferA ) == FAILURE ) + if( SELF_APPEND( pArea, TRUE ) == HB_FAILURE || + SELF_PUTREC( pArea, pQuickSort->pSwapBufferA ) == HB_FAILURE ) break; } } diff --git a/harbour/source/rdd/hbsix/sxcrypt.c b/harbour/source/rdd/hbsix/sxcrypt.c index e433a81fff..721ae278ec 100644 --- a/harbour/source/rdd/hbsix/sxcrypt.c +++ b/harbour/source/rdd/hbsix/sxcrypt.c @@ -146,7 +146,7 @@ static BOOL _hb_sxGetKey( PHB_ITEM pKeyItem, BYTE * pKeyVal ) if( pArea ) { pItem = hb_itemNew( NULL ); - if( SELF_INFO( pArea, DBI_PASSWORD, pItem ) == SUCCESS ) + if( SELF_INFO( pArea, DBI_PASSWORD, pItem ) == HB_SUCCESS ) pKeyItem = pItem; } } diff --git a/harbour/source/rdd/hbsix/sxord.c b/harbour/source/rdd/hbsix/sxord.c index 5dca5f0a6c..fcaf88eb63 100644 --- a/harbour/source/rdd/hbsix/sxord.c +++ b/harbour/source/rdd/hbsix/sxord.c @@ -146,7 +146,7 @@ HB_FUNC( SX_TAGNO ) if( hb_sxOrdParam( &Info ) ) { Info.itmResult = hb_itemPutNI( NULL, 0 ); - if( SELF_ORDINFO( pArea, DBOI_NUMBER, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_NUMBER, &Info ) == HB_SUCCESS ) { iOrder = hb_itemGetNI( Info.itmResult ); if( iOrder ) @@ -154,14 +154,14 @@ HB_FUNC( SX_TAGNO ) Info.itmOrder = hb_itemPutNI( NULL, iOrder ); Info.atomBagName = NULL; hb_itemClear( Info.itmResult ); - if( SELF_ORDINFO( pArea, DBOI_FULLPATH, &Info ) == SUCCESS && + if( SELF_ORDINFO( pArea, DBOI_FULLPATH, &Info ) == HB_SUCCESS && hb_itemGetCLen( Info.itmResult ) > 0 ) { Info.atomBagName = Info.itmResult; Info.itmResult = Info.itmOrder; Info.itmOrder = NULL; hb_itemClear( Info.itmResult ); - if( SELF_ORDINFO( pArea, DBOI_BAGORDER, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_BAGORDER, &Info ) == HB_SUCCESS ) iBagOrder = iOrder - hb_itemGetNI( Info.itmResult ) + 1; Info.itmOrder = Info.atomBagName; } @@ -188,7 +188,7 @@ HB_FUNC( SX_FREEZE ) BOOL fResult = FALSE; Info.itmNewVal = hb_itemPutL( NULL, TRUE ); Info.itmResult = hb_itemNew( NULL ); - if( SELF_ORDINFO( pArea, DBOI_CUSTOM, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_CUSTOM, &Info ) == HB_SUCCESS ) fResult = HB_IS_LOGICAL( Info.itmResult ) && hb_itemGetL( Info.itmResult ); hb_itemRelease( Info.itmNewVal ); @@ -211,7 +211,7 @@ HB_FUNC( SX_WARM ) BOOL fResult = FALSE; Info.itmNewVal = hb_itemPutL( NULL, FALSE ); Info.itmResult = hb_itemNew( NULL ); - if( SELF_ORDINFO( pArea, DBOI_CHGONLY, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_CHGONLY, &Info ) == HB_SUCCESS ) fResult = HB_IS_LOGICAL( Info.itmResult ) && !hb_itemGetL( Info.itmResult ); hb_itemRelease( Info.itmNewVal ); @@ -234,7 +234,7 @@ HB_FUNC( SX_CHILL ) BOOL fResult = FALSE; Info.itmNewVal = hb_itemPutL( NULL, TRUE ); Info.itmResult = hb_itemNew( NULL ); - if( SELF_ORDINFO( pArea, DBOI_CHGONLY, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_CHGONLY, &Info ) == HB_SUCCESS ) fResult = HB_IS_LOGICAL( Info.itmResult ) && hb_itemGetL( Info.itmResult ); hb_itemRelease( Info.itmNewVal ); @@ -267,13 +267,13 @@ HB_FUNC( SX_THERMOMETER ) i = hb_itemGetNI( Info.itmResult ); if( i ) { - static const USHORT s_iStates[] = + static const USHORT s_iStates[] = { DBOI_CUSTOM, DBOI_CHGONLY, DBOI_PARTIAL }; iTemperature = 4; for( i = 0; i < 3; ++i, --iTemperature ) { hb_itemClear( Info.itmResult ); - if( SELF_ORDINFO( pArea, s_iStates[i], &Info ) == SUCCESS && + if( SELF_ORDINFO( pArea, s_iStates[i], &Info ) == HB_SUCCESS && HB_IS_LOGICAL( Info.itmResult ) && hb_itemGetL( Info.itmResult ) ) break; @@ -467,7 +467,7 @@ HB_FUNC( SX_INDEXTYPE ) Info.itmOrder = NULL; } Info.itmResult = hb_itemNew( NULL ); - if( SELF_ORDINFO( pArea, DBOI_INDEXTYPE, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_INDEXTYPE, &Info ) == HB_SUCCESS ) iType = hb_itemGetNI( Info.itmResult ); hb_itemRelease( Info.itmResult ); } @@ -485,7 +485,7 @@ HB_FUNC( SX_DESCEND ) if( hb_sxOrdParam( &Info ) ) { Info.itmResult = hb_itemNew( NULL ); - if( SELF_ORDINFO( pArea, DBOI_ISDESC, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_ISDESC, &Info ) == HB_SUCCESS ) { Info.itmNewVal = hb_itemPutL( NULL, !hb_itemGetL( Info.itmResult ) ); SELF_ORDINFO( pArea, DBOI_ISDESC, &Info ); @@ -559,10 +559,10 @@ HB_FUNC( SX_KEYSKIP ) if( pArea ) { - if( SELF_SKIPRAW( pArea, ISNUM( 1 ) ? hb_parnl( 1 ) : 1 ) == SUCCESS ) + if( SELF_SKIPRAW( pArea, ISNUM( 1 ) ? hb_parnl( 1 ) : 1 ) == HB_SUCCESS ) { - if( SELF_EOF( pArea, &fBEof ) == SUCCESS && !fBEof ) - fResult = SELF_BOF( pArea, &fBEof ) == SUCCESS && !fBEof; + if( SELF_EOF( pArea, &fBEof ) == HB_SUCCESS && !fBEof ) + fResult = SELF_BOF( pArea, &fBEof ) == HB_SUCCESS && !fBEof; } } hb_retl( fResult ); @@ -654,9 +654,9 @@ HB_FUNC( SX_SEEKLAST ) PHB_ITEM pKey = hb_param( 1, HB_IT_ANY ); BOOL bSoftSeek = ISLOG( 2 ) && hb_parl( 2 ); - if( SELF_SEEK( pArea, bSoftSeek, pKey, TRUE ) == SUCCESS ) + if( SELF_SEEK( pArea, bSoftSeek, pKey, TRUE ) == HB_SUCCESS ) { - if( SELF_FOUND( pArea, &fFound ) != SUCCESS ) + if( SELF_FOUND( pArea, &fFound ) != HB_SUCCESS ) fFound = FALSE; } } @@ -695,29 +695,29 @@ HB_FUNC( SX_WILDSEEK ) if( szPattern && szPattern[0] ) { - if( SELF_ORDINFO( pArea, DBOI_NUMBER, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_NUMBER, &Info ) == HB_SUCCESS ) iOrder = hb_itemGetNI( Info.itmResult ); } if( iOrder > 0 ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; if( !fCont ) { errCode = SELF_GOTOP( pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = SELF_ORDINFO( pArea, DBOI_KEYVAL, &Info ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { char * szKey = hb_itemGetCPtr( Info.itmResult ); fFound = hb_strMatchWild( szKey, szPattern ); } } } - if( !fFound && errCode == SUCCESS ) + if( !fFound && errCode == HB_SUCCESS ) { Info.itmNewVal = hb_param( 1, HB_IT_STRING ); - if( SELF_ORDINFO( pArea, DBOI_SKIPWILD, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_SKIPWILD, &Info ) == HB_SUCCESS ) fFound = HB_IS_LOGICAL( Info.itmResult ) && hb_itemGetL( Info.itmResult ); } @@ -742,7 +742,7 @@ HB_FUNC( SX_ROXLOCK ) { Info.itmNewVal = hb_itemPutL( NULL, TRUE ); Info.itmResult = hb_itemPutL( NULL, FALSE ); - if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == HB_SUCCESS ) fLocked = hb_itemGetL( Info.itmResult ); hb_itemRelease( Info.itmNewVal ); hb_itemRelease( Info.itmResult ); @@ -780,7 +780,7 @@ HB_FUNC( SX_ISMYROX ) if( hb_sxOrdParam( &Info ) ) { Info.itmResult = hb_itemNew( NULL ); - if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == HB_SUCCESS ) fLocked = hb_itemGetL( Info.itmResult ); hb_itemRelease( Info.itmResult ); } @@ -799,12 +799,12 @@ HB_FUNC( SX_ISROXLOCK ) if( hb_sxOrdParam( &Info ) ) { Info.itmResult = hb_itemNew( NULL ); - if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == HB_SUCCESS ) fLocked = hb_itemGetL( Info.itmResult ); if( !fLocked ) { Info.itmNewVal = hb_itemPutL( NULL, TRUE ); - if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == HB_SUCCESS ) fLocked = hb_itemGetL( Info.itmResult ); if( fLocked ) { @@ -831,7 +831,7 @@ HB_FUNC( SX_SORTOPTION ) { Info.itmResult = hb_itemNew( NULL ); Info.itmNewVal = hb_param( 1, HB_IT_LOGICAL ); - if( SELF_ORDINFO( pArea, DBOI_USECURRENT, &Info ) == SUCCESS ) + if( SELF_ORDINFO( pArea, DBOI_USECURRENT, &Info ) == HB_SUCCESS ) fUseCurrent = hb_itemGetL( Info.itmResult ); hb_itemRelease( Info.itmResult ); } diff --git a/harbour/source/rdd/hbsix/sxtable.c b/harbour/source/rdd/hbsix/sxtable.c index e23694b730..840738f688 100644 --- a/harbour/source/rdd/hbsix/sxtable.c +++ b/harbour/source/rdd/hbsix/sxtable.c @@ -142,7 +142,7 @@ HB_FUNC( SX_IDTYPE ) if( pArea ) { PHB_ITEM pItem = hb_itemNew( NULL ); - if( SELF_RECINFO( pArea, NULL, DBRI_ENCRYPTED, pItem ) == SUCCESS ) + if( SELF_RECINFO( pArea, NULL, DBRI_ENCRYPTED, pItem ) == HB_SUCCESS ) iType = hb_itemGetL( pItem ) ? 2 : 1; hb_itemRelease( pItem ); } @@ -158,7 +158,7 @@ HB_FUNC( SX_TABLETYPE ) if( pArea ) { PHB_ITEM pItem = hb_itemNew( NULL ); - if( SELF_INFO( pArea, DBI_ISENCRYPTED, pItem ) == SUCCESS ) + if( SELF_INFO( pArea, DBI_ISENCRYPTED, pItem ) == HB_SUCCESS ) iType = hb_itemGetL( pItem ) ? 2 : 1; hb_itemRelease( pItem ); } @@ -186,7 +186,7 @@ static void hb_sxRollBackChild( AREAP pArea, PHB_ITEM pItem ) while( lpdbRelation ) { - if( SELF_INFO( lpdbRelation->lpaChild, DBI_ROLLBACK, pItem ) != SUCCESS ) + if( SELF_INFO( lpdbRelation->lpaChild, DBI_ROLLBACK, pItem ) != HB_SUCCESS ) break; hb_sxRollBackChild( lpdbRelation->lpaChild, pItem ); lpdbRelation = lpdbRelation->lpdbriNext; @@ -213,7 +213,7 @@ HB_FUNC( SX_ROLLBACK ) if( pArea ) { PHB_ITEM pItem = hb_itemNew( NULL ); - fResult = SELF_INFO( pArea, DBI_ROLLBACK, pItem ) == SUCCESS; + fResult = SELF_INFO( pArea, DBI_ROLLBACK, pItem ) == HB_SUCCESS; if( fResult && fRollChild ) hb_sxRollBackChild( pArea, pItem ); hb_itemRelease( pItem ); @@ -295,7 +295,7 @@ HB_FUNC( SX_SETPASS ) if( pArea ) { pItem = hb_itemParam( 1 ); - if( SELF_INFO( pArea, DBI_PASSWORD, pItem ) == SUCCESS ) + if( SELF_INFO( pArea, DBI_PASSWORD, pItem ) == HB_SUCCESS ) fResult = TRUE; hb_itemRelease( pItem ); } @@ -322,7 +322,7 @@ HB_FUNC( SX_SETPASS ) if( pRDDNode ) { pItem = hb_itemParam( 1 ); - if( SELF_RDDINFO( pRDDNode, RDDI_PENDINGPASSWORD, hb_parnl( 4 ), pItem ) == SUCCESS ) + if( SELF_RDDINFO( pRDDNode, RDDI_PENDINGPASSWORD, hb_parnl( 4 ), pItem ) == HB_SUCCESS ) fResult = TRUE; hb_itemRelease( pItem ); } @@ -337,7 +337,7 @@ HB_FUNC( SX_SETPASS ) { case 1: /* return current password key in raw form */ pItem = hb_itemNew( NULL ); - if( SELF_INFO( pArea, DBI_PASSWORD, pItem ) == SUCCESS ) + if( SELF_INFO( pArea, DBI_PASSWORD, pItem ) == HB_SUCCESS ) hb_itemReturn( pItem ); hb_itemRelease( pItem ); break; @@ -372,7 +372,7 @@ HB_FUNC( SX_DBFENCRYPT ) #else PHB_ITEM pItem = hb_itemParam( 1 ); #endif - if( SELF_INFO( pArea, DBI_ENCRYPT, pItem ) == SUCCESS ) + if( SELF_INFO( pArea, DBI_ENCRYPT, pItem ) == HB_SUCCESS ) fResult = hb_itemGetL( pItem ); hb_itemRelease( pItem ); } @@ -387,7 +387,7 @@ HB_FUNC( SX_DBFDECRYPT ) if( pArea ) { PHB_ITEM pItem = hb_itemParam( 1 ); - if( SELF_INFO( pArea, DBI_DECRYPT, pItem ) == SUCCESS ) + if( SELF_INFO( pArea, DBI_DECRYPT, pItem ) == HB_SUCCESS ) fResult = hb_itemGetL( pItem ); hb_itemRelease( pItem ); } @@ -405,7 +405,7 @@ HB_FUNC( SX_MEMOPACK ) int i, iPCount = hb_pcount(); for( i = 1; i <= iPCount; ++i ) hb_arraySet( pItem, i, hb_param( i, HB_IT_ANY ) ); - fResult = SELF_INFO( pArea, DBI_MEMOPACK, pItem ) == SUCCESS; + fResult = SELF_INFO( pArea, DBI_MEMOPACK, pItem ) == HB_SUCCESS; hb_itemRelease( pItem ); } hb_retl( fResult ); @@ -420,7 +420,7 @@ HB_FUNC( SX_TURBOAREA ) PHB_ITEM pItem = hb_itemParam( 1 ); if( hb_pcount() > 0 && HB_IS_NIL( pItem ) ) hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( pArea, DBI_DIRTYREAD, pItem ) != SUCCESS ) + if( SELF_INFO( pArea, DBI_DIRTYREAD, pItem ) != HB_SUCCESS ) hb_itemPutL( pItem, FALSE ); hb_itemReturnRelease( pItem ); } @@ -447,7 +447,7 @@ HB_FUNC( SX_SETTURBO ) PHB_ITEM pItem = hb_itemParam( 1 ); if( hb_pcount() > 0 && HB_IS_NIL( pItem ) ) hb_itemPutNI( pItem, 0 ); - if( SELF_RDDINFO( pRDDNode, RDDI_DIRTYREAD, 0, pItem ) != SUCCESS ) + if( SELF_RDDINFO( pRDDNode, RDDI_DIRTYREAD, 0, pItem ) != HB_SUCCESS ) hb_itemPutL( pItem, FALSE ); hb_itemReturnRelease( pItem ); } diff --git a/harbour/source/rdd/hsx/hsx.c b/harbour/source/rdd/hsx/hsx.c index 2134652615..74996239f9 100644 --- a/harbour/source/rdd/hsx/hsx.c +++ b/harbour/source/rdd/hsx/hsx.c @@ -459,7 +459,7 @@ static void hb_hsxHashStr( BYTE * pStr, ULONG ulLen, BYTE * pKey, int iKeySize, { while( ulLen-- && ( c2 = *pStr++ ) != 0 ) { -#else +#else /* This version can work well with embedded 0 characters */ if( pStr && ulLen-- ) { @@ -550,7 +550,7 @@ static int hb_hsxCompile( char * szExpr, PHB_ITEM * pExpr ) *pExpr = NULL; if( pArea ) { - if( SELF_COMPILE( pArea, ( BYTE * ) szExpr ) == FAILURE ) + if( SELF_COMPILE( pArea, ( BYTE * ) szExpr ) == HB_FAILURE ) return HSX_BADPARMS; *pExpr = pArea->valResult; pArea->valResult = NULL; @@ -609,7 +609,7 @@ static int hb_hsxEval( int iHandle, PHB_ITEM pExpr, BYTE *pKey, BOOL *fDeleted ) AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); if( !pArea ) *fDeleted = FALSE; - else if( SELF_DELETED( pArea, fDeleted ) == FAILURE ) + else if( SELF_DELETED( pArea, fDeleted ) == HB_FAILURE ) iResult = HSX_RDDFAILURE; } if( iArea ) @@ -627,7 +627,7 @@ static int hb_hsxEval( int iHandle, PHB_ITEM pExpr, BYTE *pKey, BOOL *fDeleted ) static void hb_hsxGetRecCount( LPHSXINFO pHSX ) { - pHSX->ulRecCount = ( ULONG ) ( ( hb_fileSize( pHSX->pFile ) - + pHSX->ulRecCount = ( ULONG ) ( ( hb_fileSize( pHSX->pFile ) - HSXHEADER_LEN ) / pHSX->uiRecordSize ); } @@ -1217,7 +1217,7 @@ static LPHSXINFO hb_hsxNew( void ) if( iHandle == pTable->iHandleSize ) { pTable->iHandleSize += HSX_HALLOC; - pTable->handleArray = ( LPHSXINFO * ) hb_xrealloc( pTable->handleArray, + pTable->handleArray = ( LPHSXINFO * ) hb_xrealloc( pTable->handleArray, sizeof( LPHSXINFO ) * pTable->iHandleSize ); memset( &pTable->handleArray[ iHandle ], 0, sizeof( LPHSXINFO ) * HSX_HALLOC ); } @@ -1518,7 +1518,7 @@ static int hb_hsxIndex( char * szFile, PHB_ITEM pExpr, int iKeySize, int iMode, { int iRetVal = HSX_SUCCESS, iHandle; ULONG ulRecNo = 0, ulRecCount = 0, ulNewRec, ulRec; - ERRCODE errCode; + HB_ERRCODE errCode; AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); if( !pArea ) @@ -1532,15 +1532,15 @@ static int hb_hsxIndex( char * szFile, PHB_ITEM pExpr, int iKeySize, int iMode, return iHandle; errCode = SELF_RECCOUNT( pArea, &ulRecCount ); - if( errCode != FAILURE && ulRecCount ) + if( errCode != HB_FAILURE && ulRecCount ) { errCode = SELF_RECNO( pArea, &ulRecNo ); - if( errCode != FAILURE ) + if( errCode != HB_FAILURE ) { for( ulRec = 1; ulRec <= ulRecCount; ulRec++ ) { errCode = SELF_GOTO( pArea, ulRec ); - if( errCode == FAILURE ) + if( errCode == HB_FAILURE ) break; iRetVal = hb_hsxAdd( iHandle, &ulNewRec, NULL, FALSE ); if( iRetVal != HSX_SUCCESS ) @@ -1563,7 +1563,7 @@ static int hb_hsxIndex( char * szFile, PHB_ITEM pExpr, int iKeySize, int iMode, hb_hsxDestroy( iHandle ); if( iRetVal != HSX_SUCCESS ) return iRetVal; - if( errCode == FAILURE ) + if( errCode == HB_FAILURE ) return HSX_RDDFAILURE; return hb_hsxOpen( szFile, iBufSize, iMode ); @@ -1576,7 +1576,7 @@ static int hb_hsxFilter( int iHandle, BYTE * pSeek, ULONG ulSeek, LPHSXINFO pHSX = hb_hsxGetPointer( iHandle ); BOOL fDestroyExpr = FALSE, fValid; int iResult = HSX_SUCCESS; - ERRCODE errCode; + HB_ERRCODE errCode; ULONG ulRecNo = 0, ulRec; PHB_ITEM pItem; @@ -1607,12 +1607,12 @@ static int hb_hsxFilter( int iHandle, BYTE * pSeek, ULONG ulSeek, } errCode = SELF_RECNO( pArea, &ulRecNo ); - if( errCode != FAILURE ) + if( errCode != HB_FAILURE ) iResult = hb_hsxSeekSet( iHandle, pSeek, ulSeek ); fValid = TRUE; pItem = hb_itemNew( NULL ); - while( iResult == HSX_SUCCESS && errCode != FAILURE ) + while( iResult == HSX_SUCCESS && errCode != HB_FAILURE ) { iResult = hb_hsxNext( iHandle, &ulRec ); if( iResult != HSX_SUCCESS || ulRec == 0 ) @@ -1620,10 +1620,10 @@ static int hb_hsxFilter( int iHandle, BYTE * pSeek, ULONG ulSeek, if( pVerify ) { errCode = SELF_GOTO( pArea, ulRec ); - if( errCode == FAILURE ) + if( errCode == HB_FAILURE ) break; errCode = SELF_EVALBLOCK( pArea, pVerify ); - if( errCode == FAILURE ) + if( errCode == HB_FAILURE ) break; fValid = hb_hsxVerify( iHandle, ( BYTE * ) hb_itemGetCPtr( pArea->valResult ), @@ -1650,7 +1650,7 @@ static int hb_hsxFilter( int iHandle, BYTE * pSeek, ULONG ulSeek, if( fDestroyExpr ) hb_hsxExpDestroy( pVerify ); - return errCode == FAILURE ? HSX_RDDFAILURE : iResult; + return errCode == HB_FAILURE ? HSX_RDDFAILURE : iResult; } @@ -1726,7 +1726,7 @@ HB_FUNC( HS_ADD ) HB_FUNC( HS_REPLACE ) { if( hb_param( 1, HB_IT_NUMERIC ) && hb_param( 3, HB_IT_NUMERIC ) ) - hb_retni( hb_hsxReplace( hb_parni( 1 ), hb_parnl( 3 ), + hb_retni( hb_hsxReplace( hb_parni( 1 ), hb_parnl( 3 ), hb_param( 2, HB_IT_BLOCK | HB_IT_STRING ), hb_parl( 4 ) ) ); else @@ -1852,7 +1852,7 @@ HB_FUNC( HS_FILTER ) iResult = HSX_NOTABLE; } /* create empty workarea RM filter */ - else if( SELF_INFO( pArea, DBI_RM_CREATE, pItem ) == FAILURE ) + else if( SELF_INFO( pArea, DBI_RM_CREATE, pItem ) == HB_FAILURE ) iResult = HSX_RDDFAILURE; else { @@ -1882,7 +1882,7 @@ HB_FUNC( HS_FILTER ) if( iResult == HSX_SUCCESS ) { hb_itemPutNI( pItem, 0 ); - if( SELF_INFO( pArea, DBI_RM_COUNT, pItem ) == FAILURE ) + if( SELF_INFO( pArea, DBI_RM_COUNT, pItem ) == HB_FAILURE ) iResult = HSX_RDDFAILURE; else ulRecords = hb_itemGetNL( pItem ); diff --git a/harbour/source/rdd/nulsys/nulsys.c b/harbour/source/rdd/nulsys/nulsys.c index 40d97c8f59..69697c250b 100644 --- a/harbour/source/rdd/nulsys/nulsys.c +++ b/harbour/source/rdd/nulsys/nulsys.c @@ -54,25 +54,25 @@ #include "hbapi.h" #include "hbapirdd.h" -ERRCODE hb_rddSelectWorkAreaAlias( const char * szName ) +HB_ERRCODE hb_rddSelectWorkAreaAlias( const char * szName ) { HB_SYMBOL_UNUSED( szName ); - return FAILURE; + return HB_FAILURE; } -ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) +HB_ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) { HB_SYMBOL_UNUSED( iArea ); - return FAILURE; + return HB_FAILURE; } -ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) +HB_ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) { HB_SYMBOL_UNUSED( pSymAlias ); - return FAILURE; + return HB_FAILURE; } int hb_rddGetCurrentWorkAreaNumber( void ) @@ -80,44 +80,44 @@ int hb_rddGetCurrentWorkAreaNumber( void ) return 0; } -ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); - return FAILURE; + return HB_FAILURE; } -ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); - return FAILURE; + return HB_FAILURE; } -ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); - return FAILURE; + return HB_FAILURE; } -ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); - return FAILURE; + return HB_FAILURE; } -ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) +HB_ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) { HB_SYMBOL_UNUSED( szAlias ); HB_SYMBOL_UNUSED( iArea ); - return FAILURE; + return HB_FAILURE; } void hb_rddCloseAll( void ) {} diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c index 8efdf17130..2208df376f 100644 --- a/harbour/source/rdd/sdf1.c +++ b/harbour/source/rdd/sdf1.c @@ -97,7 +97,7 @@ static void hb_sdfClearRecordBuffer( SDFAREAP pArea ) pArea->szEol, pArea->uiEolLen ); } -static ERRCODE hb_sdfReadRecord( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfReadRecord( SDFAREAP pArea ) { USHORT uiRead, uiToRead, uiEolPos; @@ -148,10 +148,10 @@ static ERRCODE hb_sdfReadRecord( SDFAREAP pArea ) pArea->szEol, pArea->uiEolLen ); } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_sdfNextRecord( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfNextRecord( SDFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfNextRecord(%p)", pArea)); @@ -208,7 +208,7 @@ static ERRCODE hb_sdfNextRecord( SDFAREAP pArea ) pArea->fEof = TRUE; pArea->fPositioned = FALSE; hb_sdfClearRecordBuffer( pArea ); - return SUCCESS; + return HB_SUCCESS; } pArea->ulRecordOffset = pArea->ulNextOffset; @@ -222,20 +222,20 @@ static ERRCODE hb_sdfNextRecord( SDFAREAP pArea ) /* * Position cursor at the first record. */ -static ERRCODE hb_sdfGoTop( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfGoTop( SDFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfGoTop(%p)", pArea)); - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->fTop = TRUE; pArea->fBottom = FALSE; pArea->ulRecordOffset = 0; pArea->ulRecNo = 1; - if( hb_sdfReadRecord( pArea ) != SUCCESS ) - return FAILURE; + if( hb_sdfReadRecord( pArea ) != HB_SUCCESS ) + return HB_FAILURE; return SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } @@ -243,15 +243,15 @@ static ERRCODE hb_sdfGoTop( SDFAREAP pArea ) /* * Reposition cursor, regardless of filter. */ -static ERRCODE hb_sdfSkipRaw( SDFAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_sdfSkipRaw( SDFAREAP pArea, LONG lToSkip ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfSkipRaw(%p,%ld)", pArea, lToSkip)); - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; if( lToSkip != 1 ) - return FAILURE; + return HB_FAILURE; else return hb_sdfNextRecord( pArea ); } @@ -259,7 +259,7 @@ static ERRCODE hb_sdfSkipRaw( SDFAREAP pArea, LONG lToSkip ) /* * Determine deleted status for a record. */ -static ERRCODE hb_sdfDeleted( SDFAREAP pArea, BOOL * pDeleted ) +static HB_ERRCODE hb_sdfDeleted( SDFAREAP pArea, BOOL * pDeleted ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfDeleted(%p,%p)", pArea, pDeleted)); @@ -267,37 +267,37 @@ static ERRCODE hb_sdfDeleted( SDFAREAP pArea, BOOL * pDeleted ) * pDeleted = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain number of records in WorkArea. */ -static ERRCODE hb_sdfRecCount( SDFAREAP pArea, ULONG * pRecCount ) +static HB_ERRCODE hb_sdfRecCount( SDFAREAP pArea, ULONG * pRecCount ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfRecCount(%p,%p)", pArea, pRecCount)); * pRecCount = pArea->ulRecCount; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain physical row number at current WorkArea cursor position. */ -static ERRCODE hb_sdfRecNo( SDFAREAP pArea, ULONG * pulRecNo ) +static HB_ERRCODE hb_sdfRecNo( SDFAREAP pArea, ULONG * pulRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfRecNo(%p,%p)", pArea, pulRecNo)); *pulRecNo = pArea->ulRecNo; - return SUCCESS; + return HB_SUCCESS; } /* * Obtain physical row ID at current WorkArea cursor position. */ -static ERRCODE hb_sdfRecId( SDFAREAP pArea, PHB_ITEM pRecNo ) +static HB_ERRCODE hb_sdfRecId( SDFAREAP pArea, PHB_ITEM pRecNo ) { - ERRCODE errCode; + HB_ERRCODE errCode; ULONG ulRecNo; HB_TRACE(HB_TR_DEBUG, ("hb_sdfRecId(%p,%p)", pArea, pRecNo)); @@ -324,17 +324,17 @@ static ERRCODE hb_sdfRecId( SDFAREAP pArea, PHB_ITEM pRecNo ) /* * Append a record to the WorkArea. */ -static ERRCODE hb_sdfAppend( SDFAREAP pArea, BOOL fUnLockAll ) +static HB_ERRCODE hb_sdfAppend( SDFAREAP pArea, BOOL fUnLockAll ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfAppend(%p,%d)", pArea, (int) fUnLockAll)); HB_SYMBOL_UNUSED( fUnLockAll ); - if( SELF_GOCOLD( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; - if( SELF_GOHOT( ( AREAP ) pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOHOT( ( AREAP ) pArea ) != HB_SUCCESS ) + return HB_FAILURE; pArea->ulRecordOffset = pArea->ulFileSize; pArea->ulRecNo = ++pArea->ulRecCount; @@ -342,13 +342,13 @@ static ERRCODE hb_sdfAppend( SDFAREAP pArea, BOOL fUnLockAll ) pArea->fPositioned = TRUE; hb_sdfClearRecordBuffer( pArea ); - return SUCCESS; + return HB_SUCCESS; } /* * Delete a record. */ -static ERRCODE hb_sdfDeleteRec( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfDeleteRec( SDFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfDeleteRec(%p)", pArea)); @@ -360,13 +360,13 @@ static ERRCODE hb_sdfDeleteRec( SDFAREAP pArea ) hb_sdfClearRecordBuffer( pArea ); } - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the current value of a field. */ -static ERRCODE hb_sdfGetValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_sdfGetValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { LPFIELD pField; @@ -457,32 +457,32 @@ static ERRCODE hb_sdfGetValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) hb_errPutSubCode( pError, EDBF_DATATYPE ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Assign a value to a field. */ -static ERRCODE hb_sdfPutValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_sdfPutValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { char szBuffer[ 256 ]; - ERRCODE uiError; + HB_ERRCODE uiError; LPFIELD pField; USHORT uiSize; HB_TRACE(HB_TR_DEBUG, ("hb_sdfPutValue(%p,%hu,%p)", pArea, uiIndex, pItem)); if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; if( !pArea->fRecordChanged ) - return FAILURE; + return HB_FAILURE; - uiError = SUCCESS; + uiError = HB_SUCCESS; --uiIndex; pField = pArea->lpFields + uiIndex; if( pField->uiType != HB_FT_MEMO && pField->uiType != HB_FT_NONE ) @@ -545,7 +545,7 @@ static ERRCODE hb_sdfPutValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) uiError = EDBF_DATATYPE; } - if( uiError != SUCCESS ) + if( uiError != HB_SUCCESS ) { PHB_ITEM pError= hb_errNew(); USHORT uiGenCode = uiError == EDBF_DATAWIDTH ? EG_DATAWIDTH : EDBF_DATATYPE; @@ -557,47 +557,47 @@ static ERRCODE hb_sdfPutValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) hb_errPutFlags( pError, EF_CANDEFAULT ); uiError = SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return uiError == E_DEFAULT ? SUCCESS : FAILURE; + return uiError == E_DEFAULT ? HB_SUCCESS : HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Replace the current record. */ -static ERRCODE hb_sdfPutRec( SDFAREAP pArea, BYTE * pBuffer ) +static HB_ERRCODE hb_sdfPutRec( SDFAREAP pArea, BYTE * pBuffer ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfPutRec(%p,%p)", pArea, pBuffer)); if( !pArea->fPositioned ) - return SUCCESS; + return HB_SUCCESS; if( !pArea->fRecordChanged ) - return FAILURE; + return HB_FAILURE; /* Copy data to buffer */ memcpy( pArea->pRecord, pBuffer + 1, pArea->uiRecordLen ); - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve current record buffer */ -static ERRCODE hb_sdfGetRec( SDFAREAP pArea, BYTE ** pBufferPtr ) +static HB_ERRCODE hb_sdfGetRec( SDFAREAP pArea, BYTE ** pBufferPtr ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfGetRec(%p,%p)", pArea, pBufferPtr)); *pBufferPtr = pArea->pRecord - 1; - return SUCCESS; + return HB_SUCCESS; } /* * Copy one or more records from one WorkArea to another. */ -static ERRCODE hb_sdfTrans( SDFAREAP pArea, LPDBTRANSINFO pTransInfo ) +static HB_ERRCODE hb_sdfTrans( SDFAREAP pArea, LPDBTRANSINFO pTransInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfTrans(%p, %p)", pArea, pTransInfo)); @@ -610,10 +610,10 @@ static ERRCODE hb_sdfTrans( SDFAREAP pArea, LPDBTRANSINFO pTransInfo ) else { PHB_ITEM pPutRec = hb_itemPutL( NULL, FALSE ); - if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != SUCCESS ) + if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != HB_SUCCESS ) { hb_itemRelease( pPutRec ); - return FAILURE; + return HB_FAILURE; } if( hb_itemGetL( pPutRec ) ) pTransInfo->uiFlags |= DBTF_PUTREC; @@ -628,7 +628,7 @@ static ERRCODE hb_sdfTrans( SDFAREAP pArea, LPDBTRANSINFO pTransInfo ) /* * Perform a write of WorkArea memory to the data store. */ -static ERRCODE hb_sdfGoCold( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfGoCold( SDFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfGoCold(%p)", pArea)); @@ -648,20 +648,20 @@ static ERRCODE hb_sdfGoCold( SDFAREAP pArea ) hb_errPutFileName( pError, pArea->szFileName ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } pArea->ulFileSize += ulWrite; pArea->ulNextOffset = pArea->ulFileSize; pArea->fRecordChanged = FALSE; pArea->fFlush = TRUE; } - return SUCCESS; + return HB_SUCCESS; } /* * Mark the WorkArea data buffer as hot. */ -static ERRCODE hb_sdfGoHot( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfGoHot( SDFAREAP pArea ) { PHB_ITEM pError; @@ -675,18 +675,18 @@ static ERRCODE hb_sdfGoHot( SDFAREAP pArea ) hb_errPutSubCode( pError, EDBF_READONLY ); SELF_ERROR( ( AREAP ) pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } pArea->fRecordChanged = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* * Write data buffer to the data store. */ -static ERRCODE hb_sdfFlush( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfFlush( SDFAREAP pArea ) { - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_sdfFlush(%p)", pArea)); @@ -708,7 +708,7 @@ static ERRCODE hb_sdfFlush( SDFAREAP pArea ) /* * Retrieve information about the current table/driver. */ -static ERRCODE hb_sdfInfo( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_sdfInfo( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfInfo(%p,%hu,%p)", pArea, uiIndex, pItem)); @@ -762,13 +762,13 @@ static ERRCODE hb_sdfInfo( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) return SUPER_INFO( ( AREAP ) pArea, uiIndex, pItem ); } - return SUCCESS; + return HB_SUCCESS; } /* * Add a field to the WorkArea. */ -static ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo ) +static HB_ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfAddField(%p, %p)", pArea, pFieldInfo)); @@ -873,12 +873,12 @@ static ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo ) /* * Establish the extent of the array of fields for a WorkArea. */ -static ERRCODE hb_sdfSetFieldExtent( SDFAREAP pArea, USHORT uiFieldExtent ) +static HB_ERRCODE hb_sdfSetFieldExtent( SDFAREAP pArea, USHORT uiFieldExtent ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfSetFieldExtent(%p,%hu)", pArea, uiFieldExtent)); - if( SUPER_SETFIELDEXTENT( ( AREAP ) pArea, uiFieldExtent ) == FAILURE ) - return FAILURE; + if( SUPER_SETFIELDEXTENT( ( AREAP ) pArea, uiFieldExtent ) == HB_FAILURE ) + return HB_FAILURE; /* Alloc field offsets array */ if( uiFieldExtent ) @@ -887,42 +887,42 @@ static ERRCODE hb_sdfSetFieldExtent( SDFAREAP pArea, USHORT uiFieldExtent ) memset( pArea->pFieldOffset, 0, uiFieldExtent * sizeof( USHORT ) ); } - return SUCCESS; + return HB_SUCCESS; } /* * Clear the WorkArea for use. */ -static ERRCODE hb_sdfNewArea( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfNewArea( SDFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfNewArea(%p)", pArea)); - if( SUPER_NEW( ( AREAP ) pArea ) == FAILURE ) - return FAILURE; + if( SUPER_NEW( ( AREAP ) pArea ) == HB_FAILURE ) + return HB_FAILURE; pArea->pFile = NULL; pArea->fTransRec = TRUE; pArea->uiRecordLen = 0; - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve the size of the WorkArea structure. */ -static ERRCODE hb_sdfStructSize( SDFAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_sdfStructSize( SDFAREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfStrucSize(%p,%p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( SDFAREA ); - return SUCCESS; + return HB_SUCCESS; } /* * Close the table in the WorkArea. */ -static ERRCODE hb_sdfClose( SDFAREAP pArea ) +static HB_ERRCODE hb_sdfClose( SDFAREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfClose(%p)", pArea)); @@ -957,15 +957,15 @@ static ERRCODE hb_sdfClose( SDFAREAP pArea ) pArea->szFileName = NULL; } - return SUCCESS; + return HB_SUCCESS; } /* * Create a data store in the specified WorkArea. */ -static ERRCODE hb_sdfCreate( SDFAREAP pArea, LPDBOPENINFO pCreateInfo ) +static HB_ERRCODE hb_sdfCreate( SDFAREAP pArea, LPDBOPENINFO pCreateInfo ) { - ERRCODE errCode; + HB_ERRCODE errCode; PHB_FNAME pFileName; PHB_ITEM pError = NULL; BOOL fRetry; @@ -1031,10 +1031,10 @@ static ERRCODE hb_sdfCreate( SDFAREAP pArea, LPDBOPENINFO pCreateInfo ) hb_itemRelease( pError ); if( !pArea->pFile ) - return FAILURE; + return HB_FAILURE; errCode = SUPER_CREATE( ( AREAP ) pArea, pCreateInfo ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); return errCode; @@ -1049,11 +1049,11 @@ static ERRCODE hb_sdfCreate( SDFAREAP pArea, LPDBOPENINFO pCreateInfo ) /* * Open a data store in the WorkArea. */ -static ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pError = NULL; PHB_FNAME pFileName; - ERRCODE errCode; + HB_ERRCODE errCode; USHORT uiFlags; BOOL fRetry; BYTE szFileName[ _POSIX_PATH_MAX + 1 ]; @@ -1129,13 +1129,13 @@ static ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo ) hb_itemRelease( pError ); if( !pArea->pFile ) - return FAILURE; + return HB_FAILURE; errCode = SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_CLOSE( ( AREAP ) pArea ); - return FAILURE; + return HB_FAILURE; } hb_sdfInitArea( pArea, ( char * ) szFileName ); @@ -1147,7 +1147,7 @@ static ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo ) /* * Retrieve information about the current driver. */ -static ERRCODE hb_sdfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +static HB_ERRCODE hb_sdfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfRddInfo(%p,%hu,%lu,%p)", pRDD, uiIndex, ulConnect, pItem)); @@ -1167,7 +1167,7 @@ static ERRCODE hb_sdfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P } - return SUCCESS; + return HB_SUCCESS; } @@ -1291,7 +1291,7 @@ HB_FUNC( SDF_GETFUNCTABLE ) hb_retni( hb_rddInherit( pTable, &sdfTable, &sdfSuper, NULL ) ); } else - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } diff --git a/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg b/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg index 5707a8d5c0..45eff5b037 100644 --- a/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg +++ b/harbour/source/rdd/usrrdd/rdds/arrayrdd.prg @@ -108,7 +108,7 @@ STATIC FUNCTION AR_INIT( nRDD ) /* Init DBF Hash */ USRRDD_RDDDATA( nRDD, hb_Hash() ) - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_RDDDATAINIT() RETURN { ; @@ -162,12 +162,12 @@ STATIC FUNCTION AR_NEW( pWA ) */ USRRDD_AREADATA( pWA, AR_WADATAINIT() ) - RETURN SUCCESS + RETURN HB_SUCCESS // Creating fields for new DBF - dbCreate() in current workarea STATIC FUNCTION AR_CREATEFIELDS( nWA, aStruct ) LOCAL aWAData := USRRDD_AREADATA( nWA ) - LOCAL nResult := SUCCESS + LOCAL nResult := HB_SUCCESS LOCAL aFieldStruct, aField #ifdef ACTIVATE_DEBUG @@ -256,7 +256,7 @@ STATIC FUNCTION AR_CREATE( nWA, aOpenInfo ) oError:CanDefault := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF */ @@ -268,7 +268,7 @@ STATIC FUNCTION AR_CREATE( nWA, aOpenInfo ) /* Call SUPER OPEN to finish allocating work area (f.e.: alias settings) */ nResult := UR_SUPER_OPEN( nWA, aOpenInfo ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS /* Add a new open number */ aDBFData[ DATABASE_OPENNUMBER ]++ // default values for Records == 0 @@ -313,7 +313,7 @@ STATIC FUNCTION AR_OPEN( nWA, aOpenInfo ) oError:FileName := aOpenInfo[ UR_OI_NAME ] oError:CanDefault := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -356,7 +356,7 @@ STATIC FUNCTION AR_OPEN( nWA, aOpenInfo ) oError:FileName := aOpenInfo[ UR_OI_NAME ] oError:CanDefault := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -373,11 +373,11 @@ STATIC FUNCTION AR_OPEN( nWA, aOpenInfo ) oError:FileName := aOpenInfo[ UR_OI_NAME ] oError:CanDefault := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF ENDIF - IF nResult == SUCCESS + IF nResult == HB_SUCCESS AR_GOTOP( nWA ) ENDIF @@ -421,11 +421,11 @@ STATIC FUNCTION AR_GETVALUE( nWA, nField, xValue ) xValue := aRecords[ nRecNo ][ nField ] ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF - RETURN FAILURE + RETURN HB_FAILURE STATIC FUNCTION AR_PUTVALUE( nWA, nField, xValue ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -450,11 +450,11 @@ STATIC FUNCTION AR_PUTVALUE( nWA, nField, xValue ) aRecords[ nRecNo ][ nField ] := xVal ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF - RETURN FAILURE + RETURN HB_FAILURE STATIC FUNCTION AR_GOTO( nWA, nRecord ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -466,8 +466,8 @@ STATIC FUNCTION AR_GOTO( nWA, nRecord ) hb_ToOutDebug( "AR_GOTO(): nWA = %i, nRecord = %i\n\r", nWA, nRecord ) #endif - //if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) - // return FAILURE; + //if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) + // return HB_FAILURE; // //if( pArea->lpdbPendingRel ) //{ @@ -509,7 +509,7 @@ STATIC FUNCTION AR_GOTO( nWA, nRecord ) ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_GOTOID( nWA, nRecord ) #ifdef ACTIVATE_DEBUG @@ -544,7 +544,7 @@ STATIC FUNCTION AR_GOTOP( nWA ) ENDIF ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_GOBOTTOM( nWA ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -573,7 +573,7 @@ STATIC FUNCTION AR_GOBOTTOM( nWA ) ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_SKIPFILTER( nWA, nRecords ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -590,8 +590,8 @@ STATIC FUNCTION AR_SKIPFILTER( nWA, nRecords ) IF nToSkip != 0 DO WHILE !aWAData[ WADATA_BOF ] .AND. !aWAData[ WADATA_EOF ] IF SET( _SET_DELETED ) .AND. aRecInfo[ aWAData[ WADATA_RECNO ] ][ RECDATA_DELETED ] - IF !( AR_SKIPRAW( nWA, nToSkip ) == SUCCESS ) - RETURN FAILURE + IF !( AR_SKIPRAW( nWA, nToSkip ) == HB_SUCCESS ) + RETURN HB_FAILURE ENDIF IF nToSkip < 0 .AND. aWAData[ WADATA_BOF ] lBof := TRUE @@ -614,7 +614,7 @@ STATIC FUNCTION AR_SKIPFILTER( nWA, nRecords ) ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_SKIPRAW( nWA, nRecords ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -653,7 +653,7 @@ STATIC FUNCTION AR_SKIPRAW( nWA, nRecords ) ENDIF - RETURN nResult // SUCCESS + RETURN nResult // HB_SUCCESS STATIC FUNCTION AR_BOF( nWA, lBof ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -670,7 +670,7 @@ STATIC FUNCTION AR_BOF( nWA, lBof ) lBof := aWAData[ WADATA_BOF ] ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_EOF( nWA, lEof ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -681,7 +681,7 @@ STATIC FUNCTION AR_EOF( nWA, lEof ) lEof := aWAData[ WADATA_EOF ] - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_DELETE( nWA ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -702,7 +702,7 @@ STATIC FUNCTION AR_DELETE( nWA ) oError:Description := HB_LANGERRMSG( EG_READONLY ) oError:FileName := aOpenInfo[ UR_OI_NAME ] UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -714,7 +714,7 @@ STATIC FUNCTION AR_DELETE( nWA ) oError:Description := HB_LANGERRMSG( EG_UNLOCKED ) oError:FileName := aOpenInfo[ UR_OI_NAME ] UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -722,7 +722,7 @@ STATIC FUNCTION AR_DELETE( nWA ) aRecInfo[ aWAData[ WADATA_RECNO ] ][ RECDATA_DELETED ] := .T. ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_DELETED( nWA, lDeleted ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -740,7 +740,7 @@ STATIC FUNCTION AR_DELETED( nWA, lDeleted ) lDeleted := .F. ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_APPEND( nWA, nRecords ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -768,7 +768,7 @@ STATIC FUNCTION AR_APPEND( nWA, nRecords ) oError:CanDefault := .T. oError:CanRetry := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -779,7 +779,7 @@ STATIC FUNCTION AR_APPEND( nWA, nRecords ) /* TODO: SHARED ACCESS */ - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_RECID( nWA, nRecNo ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -797,7 +797,7 @@ STATIC FUNCTION AR_RECID( nWA, nRecNo ) nRecNo := aWAData[ WADATA_RECNO ] ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_RECCOUNT( nWA, nRecords ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -810,7 +810,7 @@ STATIC FUNCTION AR_RECCOUNT( nWA, nRecords ) nRecords := Len( aRecords ) - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_ZAP( nWA ) LOCAL aWAData := USRRDD_AREADATA( nWA ) @@ -830,7 +830,7 @@ STATIC FUNCTION AR_ZAP( nWA ) oError:Description := HB_LANGERRMSG( EG_READONLY ) oError:FileName := aOpenInfo[ UR_OI_NAME ] UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -842,7 +842,7 @@ STATIC FUNCTION AR_ZAP( nWA ) oError:Description := HB_LANGERRMSG( EG_SHARED ) oError:FileName := aOpenInfo[ UR_OI_NAME ] UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -853,7 +853,7 @@ STATIC FUNCTION AR_ZAP( nWA ) // move to 0 recno AR_GOTO( nWA, 0 ) - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION AR_ORDINFO( nWA, xMsg, xValue ) HB_SYMBOL_UNUSED( nWA ) @@ -880,7 +880,7 @@ STATIC FUNCTION AR_ORDINFO( nWA, xMsg, xValue ) oError:Description := HB_LANGERRMSG( EG_READONLY ) oError:FileName := aOpenInfo[ UR_OI_NAME ] UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -892,7 +892,7 @@ STATIC FUNCTION AR_ORDINFO( nWA, xMsg, xValue ) oError:Description := HB_LANGERRMSG( EG_SHARED ) oError:FileName := aOpenInfo[ UR_OI_NAME ] UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF @@ -901,7 +901,7 @@ STATIC FUNCTION AR_ORDINFO( nWA, xMsg, xValue ) AR_GOTO( nWA, 0 ) */ - RETURN SUCCESS + RETURN HB_SUCCESS /* * This function have to exist in all RDD and then name have to be in @@ -951,7 +951,7 @@ INIT PROCEDURE ARRAYRDD_INIT() */ FUNCTION hb_EraseArrayRdd( cFullName ) - LOCAL nReturn := FAILURE + LOCAL nReturn := HB_FAILURE LOCAL aDBFData, oError LOCAL nRDD, aRDDList LOCAL hRDDData @@ -989,13 +989,13 @@ FUNCTION hb_EraseArrayRdd( cFullName ) //UR_SUPER_ERROR( 0, oError ) Throw( oError ) - nReturn := FAILURE + nReturn := HB_FAILURE ELSE // Delete database from slot hb_HDel( hRDDData, cFullName ) - nReturn := SUCCESS + nReturn := HB_SUCCESS ENDIF @@ -1015,7 +1015,7 @@ FUNCTION hb_EraseArrayRdd( cFullName ) //UR_SUPER_ERROR( 0, oError ) Throw( oError ) - nReturn := FAILURE + nReturn := HB_FAILURE ENDIF ELSE @@ -1031,7 +1031,7 @@ FUNCTION hb_EraseArrayRdd( cFullName ) //UR_SUPER_ERROR( 0, oError ) Throw( oError ) - nReturn := FAILURE + nReturn := HB_FAILURE ENDIF @@ -1043,7 +1043,7 @@ FUNCTION hb_EraseArrayRdd( cFullName ) */ FUNCTION hb_FileArrayRdd( cFullName ) - LOCAL nReturn := FAILURE + LOCAL nReturn := HB_FAILURE LOCAL oError LOCAL nRDD, aRDDList LOCAL hRDDData @@ -1064,7 +1064,7 @@ FUNCTION hb_FileArrayRdd( cFullName ) // First search if memory dbf exists IF HB_HHasKey( hRDDData, cFullName ) - nReturn := SUCCESS + nReturn := HB_SUCCESS ENDIF ENDIF @@ -1082,7 +1082,7 @@ FUNCTION hb_FileArrayRdd( cFullName ) //UR_SUPER_ERROR( 0, oError ) Throw( oError ) - nReturn := FAILURE + nReturn := HB_FAILURE ENDIF @@ -1099,10 +1099,10 @@ FUNCTION hb_FileArrayRdd( cFullName ) //UR_SUPER_ERROR( 0, oError ) Throw( oError ) - nReturn := FAILURE + nReturn := HB_FAILURE ENDIF - RETURN ( nReturn == SUCCESS ) + RETURN ( nReturn == HB_SUCCESS ) STATIC FUNCTION BlankRecord( aStruct ) LOCAL nLenStruct := Len( aStruct ) diff --git a/harbour/source/rdd/usrrdd/rdds/fcomma.prg b/harbour/source/rdd/usrrdd/rdds/fcomma.prg index ccc95c1b27..52706e8bb8 100644 --- a/harbour/source/rdd/usrrdd/rdds/fcomma.prg +++ b/harbour/source/rdd/usrrdd/rdds/fcomma.prg @@ -81,7 +81,7 @@ STATIC FUNCTION FCM_INIT( nRDD ) AFILL( aRData, -1 ) USRRDD_RDDDATA( nRDD, aRData ) - RETURN SUCCESS + RETURN HB_SUCCESS /* * methods: NEW and RELEASE receive pointer to work area structure @@ -101,7 +101,7 @@ STATIC FUNCTION FCM_NEW( pWA ) */ USRRDD_AREADATA( pWA, aWData ) - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_CREATE( nWA, aOpenInfo ) LOCAL oError := ErrorNew() @@ -113,7 +113,7 @@ STATIC FUNCTION FCM_CREATE( nWA, aOpenInfo ) oError:FileName := aOpenInfo[ UR_OI_NAME ] oError:CanDefault := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE STATIC FUNCTION FCM_OPEN( nWA, aOpenInfo ) LOCAL cName, nMode, nSlot, nHandle, aRData, aWData, aField, oError, nResult @@ -139,7 +139,7 @@ STATIC FUNCTION FCM_OPEN( nWA, aOpenInfo ) oError:FileName := aOpenInfo[ UR_OI_NAME ] oError:CanDefault := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF HB_FSELECT( nSlot ) @@ -154,7 +154,7 @@ STATIC FUNCTION FCM_OPEN( nWA, aOpenInfo ) oError:CanDefault := .T. UR_SUPER_ERROR( nWA, oError ) - RETURN FAILURE + RETURN HB_FAILURE ENDIF aRData[ nSlot ] := nHandle aWData[ 1 ] := nSlot @@ -173,7 +173,7 @@ STATIC FUNCTION FCM_OPEN( nWA, aOpenInfo ) /* Call SUPER OPEN to finish allocating work area (f.e.: alias settings) */ nResult := UR_SUPER_OPEN( nWA, aOpenInfo ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS FCM_GOTOP( nWA ) ENDIF @@ -201,9 +201,9 @@ STATIC FUNCTION FCM_GETVALUE( nWA, nField, xValue ) HB_FSELECT( aWData[ 1 ] ) xValue := HB_FREADLN() ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF - RETURN FAILURE + RETURN HB_FAILURE STATIC FUNCTION FCM_GOTO( nWA, nRecord ) LOCAL aWData := USRRDD_AREADATA( nWA ) @@ -220,7 +220,7 @@ STATIC FUNCTION FCM_GOTO( nWA, nRecord ) aWData[ 2 ] := HB_FRECNO() == 0 aWData[ 3 ] := HB_FEOF() ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_GOTOID( nWA, nRecord ) RETURN FCM_GOTO( nWA, nRecord ) @@ -230,7 +230,7 @@ STATIC FUNCTION FCM_GOTOP( nWA ) HB_FSELECT( aWData[ 1 ] ) HB_FGOTOP() aWData[ 2 ] := aWData[ 3 ] := HB_FEOF() - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_GOBOTTOM( nWA ) LOCAL aWData := USRRDD_AREADATA( nWA ) @@ -243,7 +243,7 @@ STATIC FUNCTION FCM_GOBOTTOM( nWA ) HB_FGOBOTTOM() aWData[ 2 ] := aWData[ 3 ] := .F. ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_SKIPRAW( nWA, nRecords ) LOCAL aWData @@ -253,7 +253,7 @@ STATIC FUNCTION FCM_SKIPRAW( nWA, nRecords ) HB_FSELECT( aWData[ 1 ] ) IF aWData[ 3 ] IF nRecords > 0 - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF FCM_GOBOTTOM( nWA ) ++nRecords @@ -268,22 +268,22 @@ STATIC FUNCTION FCM_SKIPRAW( nWA, nRecords ) aWData[ 3 ] := HB_FEOF() ENDIF ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_BOF( nWA, lBof ) LOCAL aWData := USRRDD_AREADATA( nWA ) lBof := aWData[ 2 ] - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_EOF( nWA, lEof ) LOCAL aWData := USRRDD_AREADATA( nWA ) lEof := aWData[ 3 ] - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_DELETED( nWA, lDeleted ) HB_SYMBOL_UNUSED( nWA ) lDeleted := .F. - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_RECID( nWA, nRecNo ) LOCAL aWData := USRRDD_AREADATA( nWA ) @@ -293,12 +293,12 @@ STATIC FUNCTION FCM_RECID( nWA, nRecNo ) ELSE nRecNo := HB_FRECNO() ENDIF - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION FCM_RECCOUNT( nWA, nRecords ) HB_FSELECT( USRRDD_AREADATA( nWA )[ 1 ] ) nRecords := HB_FLASTREC() - RETURN SUCCESS + RETURN HB_SUCCESS /* * This function have to exist in all RDD and then name have to be in diff --git a/harbour/source/rdd/usrrdd/rdds/hscdx.prg b/harbour/source/rdd/usrrdd/rdds/hscdx.prg index 243f45947f..f5351d9c17 100644 --- a/harbour/source/rdd/usrrdd/rdds/hscdx.prg +++ b/harbour/source/rdd/usrrdd/rdds/hscdx.prg @@ -82,7 +82,7 @@ STATIC FUNCTION _HSX_NEW( pWA ) */ USRRDD_AREADATA( pWA, aWData ) - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION _HSX_CLOSE( nWA ) LOCAL aWData:= USRRDD_AREADATA( nWA ), nHSX @@ -103,7 +103,7 @@ STATIC FUNCTION _HSX_GOCOLD( nWA ) LOCAL nResult, aWData, nHSX, nRecNo, nKeyNo nResult := UR_SUPER_GOCOLD( nWA ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS aWData:= USRRDD_AREADATA( nWA ) IF aWData[ 1 ] IF !EMPTY( aWData[ 2 ] ) @@ -129,7 +129,7 @@ STATIC FUNCTION _HSX_GOHOT( nWA ) LOCAL nResult, aWData nResult := UR_SUPER_GOHOT( nWA ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS aWData:= USRRDD_AREADATA( nWA ) aWData[ 1 ] := .T. ENDIF @@ -140,7 +140,7 @@ STATIC FUNCTION _HSX_APPEND( nWA, lUnlockAll ) LOCAL nResult, aWData nResult := UR_SUPER_APPEND( nWA, lUnlockAll ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS aWData:= USRRDD_AREADATA( nWA ) aWData[ 1 ] := .T. ENDIF diff --git a/harbour/source/rdd/usrrdd/rdds/logrdd.prg b/harbour/source/rdd/usrrdd/rdds/logrdd.prg index 80031aef75..f811474223 100644 --- a/harbour/source/rdd/usrrdd/rdds/logrdd.prg +++ b/harbour/source/rdd/usrrdd/rdds/logrdd.prg @@ -99,7 +99,7 @@ STATIC FUNCTION LOGRDD_INIT( nRDD ) /* cFileName, nHandle, cTag, lActive, cRDDName, bMsgLogBlock, bUserLogBlock */ USRRDD_RDDDATA( nRDD, { cFileName, NIL, cTag, lActive, cRDDName, NIL, NIL } ) -RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION LOGRDD_EXIT( nRDD ) LOCAL aRDDData := USRRDD_RDDDATA( nRDD ) @@ -110,12 +110,12 @@ STATIC FUNCTION LOGRDD_EXIT( nRDD ) aRDDData[ ARRAY_FHANDLE ] := NIL ENDIF -RETURN SUCCESS + RETURN HB_SUCCESS // Create database from current WA fields definition STATIC FUNCTION LOGRDD_CREATE( nWA, aOpenInfo ) LOCAL nResult := UR_SUPER_CREATE( nWA, aOpenInfo ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "CREATE", nWA, aOpenInfo ) ENDIF RETURN nResult @@ -123,7 +123,7 @@ STATIC FUNCTION LOGRDD_CREATE( nWA, aOpenInfo ) // Creating fields for new DBF - dbCreate() in current workarea STATIC FUNCTION LOGRDD_CREATEFIELDS( nWA, aStruct ) LOCAL nResult := UR_SUPER_CREATEFIELDS( nWA, aStruct ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "CREATEFIELDS", nWA, aStruct ) ENDIF RETURN nResult @@ -131,7 +131,7 @@ STATIC FUNCTION LOGRDD_CREATEFIELDS( nWA, aStruct ) // Open workarea STATIC FUNCTION LOGRDD_OPEN( nWA, aOpenInfo ) LOCAL nResult := UR_SUPER_OPEN( nWA, aOpenInfo ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "OPEN", nWA, aOpenInfo ) ENDIF RETURN nResult @@ -141,28 +141,28 @@ STATIC FUNCTION LOGRDD_CLOSE( nWA ) LOCAL cFile := dbInfo( DBI_FULLPATH ) LOCAL cAlias := Alias() LOCAL nResult := UR_SUPER_CLOSE( nWA ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "CLOSE", nWA, cFile, cAlias ) ENDIF RETURN nResult STATIC FUNCTION LOGRDD_APPEND( nWA, lUnlockAll ) LOCAL nResult := UR_SUPER_APPEND( nWA, lUnlockAll ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "APPEND", nWA, lUnlockAll ) ENDIF RETURN nResult STATIC FUNCTION LOGRDD_DELETE( nWA ) LOCAL nResult := UR_SUPER_DELETE( nWA ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "DELETE", nWA ) ENDIF RETURN nResult STATIC FUNCTION LOGRDD_RECALL( nWA ) LOCAL nResult := UR_SUPER_RECALL( nWA ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "RECALL", nWA ) ENDIF RETURN nResult @@ -179,7 +179,7 @@ STATIC FUNCTION LOGRDD_PUTVALUE( nWA, nField, xValue ) STATIC FUNCTION LOGRDD_ZAP( nWA ) LOCAL nResult := UR_SUPER_ZAP( nWA ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS ToLog( "ZAP", nWA ) ENDIF RETURN nResult @@ -486,4 +486,3 @@ STATIC PROCEDURE ToLog( cCmd, nWA, xPar1, xPar2, xPar3 ) ENDIF RETURN - diff --git a/harbour/source/rdd/usrrdd/rdds/rlcdx.prg b/harbour/source/rdd/usrrdd/rdds/rlcdx.prg index 72f6c01240..5880f784b0 100644 --- a/harbour/source/rdd/usrrdd/rdds/rlcdx.prg +++ b/harbour/source/rdd/usrrdd/rdds/rlcdx.prg @@ -81,7 +81,7 @@ STATIC FUNCTION RLCDX_NEW( pWA ) USRRDD_AREADATA( pWA, aWData ) - RETURN SUCCESS + RETURN HB_SUCCESS STATIC FUNCTION RLCDX_LOCK( nWA, aLockInfo ) LOCAL aWData, nResult, xRecId, i @@ -100,7 +100,7 @@ STATIC FUNCTION RLCDX_LOCK( nWA, aLockInfo ) IF aWData[ 1 ] > 0 aLockInfo[ UR_LI_RESULT ] := .T. - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF xRecID := aLockInfo[ UR_LI_RECORD ] @@ -110,15 +110,15 @@ STATIC FUNCTION RLCDX_LOCK( nWA, aLockInfo ) IF aWData[ 1 ] > 0 aLockInfo[ UR_LI_RESULT ] := .T. - RETURN SUCCESS + RETURN HB_SUCCESS ELSEIF ( i:= ASCAN( aWData[ 2 ], { |x| x[ 1 ] == xRecID } ) ) != 0 ++aWData[ 2, i, 2 ] aLockInfo[ UR_LI_RESULT ] := .T. - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF nResult := UR_SUPER_LOCK( nWA, aLockInfo ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS IF aLockInfo[ UR_LI_RESULT ] AADD( aWData[ 2 ], { xRecID, 1 } ) ENDIF @@ -127,14 +127,14 @@ STATIC FUNCTION RLCDX_LOCK( nWA, aLockInfo ) RETURN nResult ELSEIF aLockInfo[ UR_LI_METHOD ] == DBLM_FILE /* FLOCK */ - + IF aWData[ 1 ] > 0 ++aWData[ 1 ] - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF nResult := UR_SUPER_LOCK( nWA, aLockInfo ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS /* FLOCK always first remove all RLOCKs, even if it fails */ ASIZE( aWData[ 2 ], 0 ) @@ -150,7 +150,7 @@ STATIC FUNCTION RLCDX_LOCK( nWA, aLockInfo ) aLockInfo[ UR_LI_RESULT ] := .F. - RETURN FAILURE + RETURN HB_FAILURE STATIC FUNCTION RLCDX_UNLOCK( nWA, xRecID ) LOCAL aWData := USRRDD_AREADATA( nWA ), i @@ -158,17 +158,17 @@ STATIC FUNCTION RLCDX_UNLOCK( nWA, xRecID ) IF ISNUMBER( xRecID ) .AND. xRecID > 0 IF ( i:= ASCAN( aWData[ 2 ], { |x| x[ 1 ] == xRecID } ) ) != 0 IF --aWData[ 2, i, 2 ] > 0 - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF ADEL( aWData[ 2 ], i ) ASIZE( aWData[ 2 ], LEN( aWData[ 2 ] ) - 1 ) ELSE - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF ELSE IF aWData[ 1 ] > 1 --aWData[ 1 ] - RETURN SUCCESS + RETURN HB_SUCCESS ENDIF aWData[ 1 ] := 0 ASIZE( aWData[ 2 ], 0 ) @@ -183,7 +183,7 @@ STATIC FUNCTION RLCDX_APPEND( nWA, lUnlockAll ) lUnlockAll := .F. nResult := UR_SUPER_APPEND( nWA, lUnlockAll ) - IF nResult == SUCCESS + IF nResult == HB_SUCCESS aWData := USRRDD_AREADATA( nWA ) IF aWData[ 1 ] == 0 diff --git a/harbour/source/rdd/usrrdd/usrrdd.c b/harbour/source/rdd/usrrdd/usrrdd.c index 059c0b9071..d3a7306d0c 100644 --- a/harbour/source/rdd/usrrdd/usrrdd.c +++ b/harbour/source/rdd/usrrdd/usrrdd.c @@ -119,9 +119,9 @@ static BOOL hb_usrPushMethod( PHB_ITEM pMethods, USHORT uiMethod ) return FALSE; } -static ERRCODE hb_usrReturn( void ) +static HB_ERRCODE hb_usrReturn( void ) { - ERRCODE errCode = hb_parni( -1 ); + HB_ERRCODE errCode = hb_parni( -1 ); /* * clear the return value - it's not strictly necessary and Clipper @@ -132,7 +132,7 @@ static ERRCODE hb_usrReturn( void ) return errCode; } -static ERRCODE hb_usrEvalRddFunc( PHB_ITEM pMethods, USHORT uiMethod, USHORT uiRddID ) +static HB_ERRCODE hb_usrEvalRddFunc( PHB_ITEM pMethods, USHORT uiMethod, USHORT uiRddID ) { if( hb_usrPushMethod( pMethods, uiMethod ) ) { @@ -141,10 +141,10 @@ static ERRCODE hb_usrEvalRddFunc( PHB_ITEM pMethods, USHORT uiMethod, USHORT uiR return hb_usrReturn(); } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_usrEvalAreaFunc( PHB_ITEM pMethods, USHORT uiMethod, AREAP pArea ) +static HB_ERRCODE hb_usrEvalAreaFunc( PHB_ITEM pMethods, USHORT uiMethod, AREAP pArea ) { if( hb_usrPushMethod( pMethods, uiMethod ) ) { @@ -153,7 +153,7 @@ static ERRCODE hb_usrEvalAreaFunc( PHB_ITEM pMethods, USHORT uiMethod, AREAP pAr return hb_usrReturn(); } - return SUCCESS; + return HB_SUCCESS; } static AREAP hb_usrGetAreaPointer( int iArea ) @@ -788,9 +788,9 @@ static void hb_usrOrderCreateFree( LPDBORDERCREATEINFO pOrderCreateInfo ) * -- USRRDD METHODS -- */ -static ERRCODE hb_usrInit( LPRDDNODE pRDD ) +static HB_ERRCODE hb_usrInit( LPRDDNODE pRDD ) { - ERRCODE errCode; + HB_ERRCODE errCode; LPUSRRDDNODE pNode; HB_TRACE(HB_TR_DEBUG, ("hb_usrInit(%p)", pRDD)); @@ -819,16 +819,16 @@ static ERRCODE hb_usrInit( LPRDDNODE pRDD ) if( ISSUPER_INIT( pRDD ) ) errCode = SUPER_INIT( pRDD ); else - errCode = SUCCESS; + errCode = HB_SUCCESS; hb_usrEvalRddFunc( pNode->pMethods, UR_INIT, pRDD->rddID ); return errCode; } -static ERRCODE hb_usrExit( LPRDDNODE pRDD ) +static HB_ERRCODE hb_usrExit( LPRDDNODE pRDD ) { - ERRCODE errCode; + HB_ERRCODE errCode; LPUSRRDDNODE pNode; HB_TRACE(HB_TR_DEBUG, ("hb_usrExit(%p)", pRDD)); @@ -865,14 +865,14 @@ static ERRCODE hb_usrExit( LPRDDNODE pRDD ) if( ISSUPER_EXIT( pRDD ) ) errCode = SUPER_EXIT( pRDD ); else - errCode = SUCCESS; + errCode = HB_SUCCESS; return errCode; } -static ERRCODE hb_usrStructSize( AREAP pArea, USHORT * puiSize ) +static HB_ERRCODE hb_usrStructSize( AREAP pArea, USHORT * puiSize ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_usrStrucSize(%p, %p)", pArea, puiSize)); @@ -883,7 +883,7 @@ static ERRCODE hb_usrStructSize( AREAP pArea, USHORT * puiSize ) return errCode; } -static ERRCODE hb_usrSysName( AREAP pArea, BYTE * szSysName ) +static HB_ERRCODE hb_usrSysName( AREAP pArea, BYTE * szSysName ) { LONG lOffset; @@ -896,7 +896,7 @@ static ERRCODE hb_usrSysName( AREAP pArea, BYTE * szSysName ) hb_stackPop(); hb_strncpy( ( char * ) szSysName, SELF_RDDNODE( pArea )->szName, HB_RDD_MAX_DRIVERNAME_LEN ); - return SUCCESS; + return HB_SUCCESS; } hb_vmPushInteger( pArea->uiArea ); @@ -910,15 +910,15 @@ static ERRCODE hb_usrSysName( AREAP pArea, BYTE * szSysName ) return hb_usrReturn(); } -static ERRCODE hb_usrNewArea( AREAP pArea ) +static HB_ERRCODE hb_usrNewArea( AREAP pArea ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_usrNewArea(%p)", pArea)); errCode = SUPER_NEW( pArea ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { SELF_USRDATA( pArea )->pItem = hb_itemNew( NULL ); hb_usrEvalAreaFunc( SELF_USRNODE( pArea )->pMethods, UR_NEW, pArea ); @@ -927,7 +927,7 @@ static ERRCODE hb_usrNewArea( AREAP pArea ) return errCode; } -static ERRCODE hb_usrRelease( AREAP pArea ) +static HB_ERRCODE hb_usrRelease( AREAP pArea ) { PHB_ITEM pItem; @@ -951,7 +951,7 @@ static ERRCODE hb_usrRelease( AREAP pArea ) * Movement and positioning methods */ -static ERRCODE hb_usrBof( AREAP pArea, BOOL * pBof ) +static HB_ERRCODE hb_usrBof( AREAP pArea, BOOL * pBof ) { LONG lOffset; @@ -971,14 +971,14 @@ static ERRCODE hb_usrBof( AREAP pArea, BOOL * pBof ) if( hb_xvmPopLogical( pBof ) ) { hb_ret(); - return FAILURE; + return HB_FAILURE; } pArea->fBof = *pBof; return hb_usrReturn(); } -static ERRCODE hb_usrEof( AREAP pArea, BOOL * pEof ) +static HB_ERRCODE hb_usrEof( AREAP pArea, BOOL * pEof ) { LONG lOffset; @@ -998,14 +998,14 @@ static ERRCODE hb_usrEof( AREAP pArea, BOOL * pEof ) if( hb_xvmPopLogical( pEof ) ) { hb_ret(); - return FAILURE; + return HB_FAILURE; } pArea->fEof = *pEof; return hb_usrReturn(); } -static ERRCODE hb_usrFound( AREAP pArea, BOOL * pFound ) +static HB_ERRCODE hb_usrFound( AREAP pArea, BOOL * pFound ) { LONG lOffset; @@ -1025,14 +1025,14 @@ static ERRCODE hb_usrFound( AREAP pArea, BOOL * pFound ) if( hb_xvmPopLogical( pFound ) ) { hb_ret(); - return FAILURE; + return HB_FAILURE; } pArea->fFound = *pFound; return hb_usrReturn(); } -static ERRCODE hb_usrGoBottom( AREAP pArea ) +static HB_ERRCODE hb_usrGoBottom( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGoBottom(%p)", pArea)); @@ -1045,7 +1045,7 @@ static ERRCODE hb_usrGoBottom( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrGoTop( AREAP pArea ) +static HB_ERRCODE hb_usrGoTop( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGoTop(%p)", pArea)); @@ -1058,7 +1058,7 @@ static ERRCODE hb_usrGoTop( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrGoTo( AREAP pArea, ULONG ulRecNo ) +static HB_ERRCODE hb_usrGoTo( AREAP pArea, ULONG ulRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGoTo(%p,%lu)", pArea, ulRecNo)); @@ -1072,7 +1072,7 @@ static ERRCODE hb_usrGoTo( AREAP pArea, ULONG ulRecNo ) return hb_usrReturn(); } -static ERRCODE hb_usrGoToId( AREAP pArea, PHB_ITEM pRecNo ) +static HB_ERRCODE hb_usrGoToId( AREAP pArea, PHB_ITEM pRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGoToId(%p,%p)", pArea, pRecNo)); @@ -1086,7 +1086,7 @@ static ERRCODE hb_usrGoToId( AREAP pArea, PHB_ITEM pRecNo ) return hb_usrReturn(); } -static ERRCODE hb_usrSeek( AREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) +static HB_ERRCODE hb_usrSeek( AREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSeek(%p,%d,%p,%d)", pArea, fSoftSeek, pItem, fFindLast)); @@ -1102,7 +1102,7 @@ static ERRCODE hb_usrSeek( AREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFi return hb_usrReturn(); } -static ERRCODE hb_usrSkip( AREAP pArea, LONG lRecords ) +static HB_ERRCODE hb_usrSkip( AREAP pArea, LONG lRecords ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSkip(%p,%ld)", pArea, lRecords)); @@ -1116,7 +1116,7 @@ static ERRCODE hb_usrSkip( AREAP pArea, LONG lRecords ) return hb_usrReturn(); } -static ERRCODE hb_usrSkipFilter( AREAP pArea, LONG lDirect ) +static HB_ERRCODE hb_usrSkipFilter( AREAP pArea, LONG lDirect ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSkipFilter(%p,%ld)", pArea, lDirect)); @@ -1130,7 +1130,7 @@ static ERRCODE hb_usrSkipFilter( AREAP pArea, LONG lDirect ) return hb_usrReturn(); } -static ERRCODE hb_usrSkipRaw( AREAP pArea, LONG lRecords ) +static HB_ERRCODE hb_usrSkipRaw( AREAP pArea, LONG lRecords ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSkipRaw(%p,%ld)", pArea, lRecords)); @@ -1149,7 +1149,7 @@ static ERRCODE hb_usrSkipRaw( AREAP pArea, LONG lRecords ) * Data management */ -static ERRCODE hb_usrDeleted( AREAP pArea, BOOL * pDeleted ) +static HB_ERRCODE hb_usrDeleted( AREAP pArea, BOOL * pDeleted ) { LONG lOffset; @@ -1169,13 +1169,13 @@ static ERRCODE hb_usrDeleted( AREAP pArea, BOOL * pDeleted ) if( hb_xvmPopLogical( pDeleted ) ) { hb_ret(); - return FAILURE; + return HB_FAILURE; } return hb_usrReturn(); } -static ERRCODE hb_usrAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo ) +static HB_ERRCODE hb_usrAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo ) { PHB_ITEM pItem; @@ -1194,7 +1194,7 @@ static ERRCODE hb_usrAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrFieldDisplay( AREAP pArea, LPDBFIELDINFO pFieldInfo ) +static HB_ERRCODE hb_usrFieldDisplay( AREAP pArea, LPDBFIELDINFO pFieldInfo ) { PHB_ITEM pItem; @@ -1213,7 +1213,7 @@ static ERRCODE hb_usrFieldDisplay( AREAP pArea, LPDBFIELDINFO pFieldInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrFieldName( AREAP pArea, USHORT uiIndex, void * szName ) +static HB_ERRCODE hb_usrFieldName( AREAP pArea, USHORT uiIndex, void * szName ) { LONG lOffset; @@ -1239,7 +1239,7 @@ static ERRCODE hb_usrFieldName( AREAP pArea, USHORT uiIndex, void * szName ) return hb_usrReturn(); } -static ERRCODE hb_usrAppend( AREAP pArea, BOOL fUnLockAll ) +static HB_ERRCODE hb_usrAppend( AREAP pArea, BOOL fUnLockAll ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrAppend(%p, %d)", pArea, fUnLockAll)); @@ -1253,7 +1253,7 @@ static ERRCODE hb_usrAppend( AREAP pArea, BOOL fUnLockAll ) return hb_usrReturn(); } -static ERRCODE hb_usrDelete( AREAP pArea ) +static HB_ERRCODE hb_usrDelete( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrDelete(%p)", pArea)); @@ -1266,7 +1266,7 @@ static ERRCODE hb_usrDelete( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrRecall( AREAP pArea ) +static HB_ERRCODE hb_usrRecall( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrRecall(%p)", pArea)); @@ -1279,7 +1279,7 @@ static ERRCODE hb_usrRecall( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrFieldCount( AREAP pArea, USHORT * puiFields ) +static HB_ERRCODE hb_usrFieldCount( AREAP pArea, USHORT * puiFields ) { LONG lOffset; @@ -1303,7 +1303,7 @@ static ERRCODE hb_usrFieldCount( AREAP pArea, USHORT * puiFields ) return hb_usrReturn(); } -static ERRCODE hb_usrFlush( AREAP pArea ) +static HB_ERRCODE hb_usrFlush( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrFlush(%p)", pArea)); @@ -1316,7 +1316,7 @@ static ERRCODE hb_usrFlush( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrGoCold( AREAP pArea ) +static HB_ERRCODE hb_usrGoCold( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGoCold(%p)", pArea)); @@ -1329,7 +1329,7 @@ static ERRCODE hb_usrGoCold( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrGoHot( AREAP pArea ) +static HB_ERRCODE hb_usrGoHot( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGoHot(%p)", pArea)); @@ -1342,7 +1342,7 @@ static ERRCODE hb_usrGoHot( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrPutRec( AREAP pArea, BYTE * pBuffer ) +static HB_ERRCODE hb_usrPutRec( AREAP pArea, BYTE * pBuffer ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrPutRec(%p,%p)", pArea, pBuffer)); @@ -1356,7 +1356,7 @@ static ERRCODE hb_usrPutRec( AREAP pArea, BYTE * pBuffer ) return hb_usrReturn(); } -static ERRCODE hb_usrGetRec( AREAP pArea, BYTE ** pBuffer ) +static HB_ERRCODE hb_usrGetRec( AREAP pArea, BYTE ** pBuffer ) { PHB_ITEM pItem; LONG lOffset; @@ -1385,7 +1385,7 @@ static ERRCODE hb_usrGetRec( AREAP pArea, BYTE ** pBuffer ) return hb_usrReturn(); } -static ERRCODE hb_usrGetValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_usrGetValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGetValue(%p,%hu,%p)", pArea, uiIndex, pItem)); @@ -1400,7 +1400,7 @@ static ERRCODE hb_usrGetValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) return hb_usrReturn(); } -static ERRCODE hb_usrPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_usrPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrPutValue(%p,%hu,%p)", pArea, uiIndex, pItem)); @@ -1415,7 +1415,7 @@ static ERRCODE hb_usrPutValue( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) return hb_usrReturn(); } -static ERRCODE hb_usrGetVarLen( AREAP pArea, USHORT uiIndex, ULONG * pulLength ) +static HB_ERRCODE hb_usrGetVarLen( AREAP pArea, USHORT uiIndex, ULONG * pulLength ) { LONG lOffset; @@ -1440,7 +1440,7 @@ static ERRCODE hb_usrGetVarLen( AREAP pArea, USHORT uiIndex, ULONG * pulLength ) return hb_usrReturn(); } -static ERRCODE hb_usrRecCount( AREAP pArea, ULONG * pulRecCount ) +static HB_ERRCODE hb_usrRecCount( AREAP pArea, ULONG * pulRecCount ) { LONG lOffset; @@ -1464,7 +1464,7 @@ static ERRCODE hb_usrRecCount( AREAP pArea, ULONG * pulRecCount ) return hb_usrReturn(); } -static ERRCODE hb_usrRecInfo( AREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, PHB_ITEM pInfo ) +static HB_ERRCODE hb_usrRecInfo( AREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, PHB_ITEM pInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrRecInfo(%p,%p,%hu,%p)", pArea, pRecID, uiInfoType, pInfo)); @@ -1480,7 +1480,7 @@ static ERRCODE hb_usrRecInfo( AREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, P return hb_usrReturn(); } -static ERRCODE hb_usrRecNo( AREAP pArea, ULONG * pulRecNo ) +static HB_ERRCODE hb_usrRecNo( AREAP pArea, ULONG * pulRecNo ) { LONG lOffset; @@ -1504,7 +1504,7 @@ static ERRCODE hb_usrRecNo( AREAP pArea, ULONG * pulRecNo ) return hb_usrReturn(); } -static ERRCODE hb_usrRecId( AREAP pArea, PHB_ITEM pRecId ) +static HB_ERRCODE hb_usrRecId( AREAP pArea, PHB_ITEM pRecId ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrRecId(%p,%p)", pArea, pRecId)); @@ -1518,7 +1518,7 @@ static ERRCODE hb_usrRecId( AREAP pArea, PHB_ITEM pRecId ) return hb_usrReturn(); } -static ERRCODE hb_usrFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiInfoType, PHB_ITEM pInfo ) +static HB_ERRCODE hb_usrFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiInfoType, PHB_ITEM pInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrFieldInfo(%p,%hu,%hu,%p)", pArea, uiIndex, uiInfoType, pInfo)); @@ -1534,7 +1534,7 @@ static ERRCODE hb_usrFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiInfoType, return hb_usrReturn(); } -static ERRCODE hb_usrCreateFields( AREAP pArea, PHB_ITEM pStruct ) +static HB_ERRCODE hb_usrCreateFields( AREAP pArea, PHB_ITEM pStruct ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrCreateFields(%p,%p)", pArea, pStruct)); @@ -1548,7 +1548,7 @@ static ERRCODE hb_usrCreateFields( AREAP pArea, PHB_ITEM pStruct ) return hb_usrReturn(); } -static ERRCODE hb_usrSetFieldExtent( AREAP pArea, USHORT uiFieldExtent ) +static HB_ERRCODE hb_usrSetFieldExtent( AREAP pArea, USHORT uiFieldExtent ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSetFieldExtent(%p,%hu)", pArea, uiFieldExtent)); @@ -1567,7 +1567,7 @@ static ERRCODE hb_usrSetFieldExtent( AREAP pArea, USHORT uiFieldExtent ) * WorkArea/Database management */ -static ERRCODE hb_usrAlias( AREAP pArea, BYTE * szAlias ) +static HB_ERRCODE hb_usrAlias( AREAP pArea, BYTE * szAlias ) { LONG lOffset; @@ -1592,7 +1592,7 @@ static ERRCODE hb_usrAlias( AREAP pArea, BYTE * szAlias ) return hb_usrReturn(); } -static ERRCODE hb_usrClose( AREAP pArea ) +static HB_ERRCODE hb_usrClose( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrClose(%p)", pArea)); @@ -1605,7 +1605,7 @@ static ERRCODE hb_usrClose( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrCreate( AREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_usrCreate( AREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pItem; @@ -1624,7 +1624,7 @@ static ERRCODE hb_usrCreate( AREAP pArea, LPDBOPENINFO pOpenInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrOpen( AREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_usrOpen( AREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pItem; @@ -1643,7 +1643,7 @@ static ERRCODE hb_usrOpen( AREAP pArea, LPDBOPENINFO pOpenInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrInfo( AREAP pArea, USHORT uiInfoType, PHB_ITEM pInfo ) +static HB_ERRCODE hb_usrInfo( AREAP pArea, USHORT uiInfoType, PHB_ITEM pInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrInfo(%p,%hu,%p)", pArea, uiInfoType, pInfo)); @@ -1658,7 +1658,7 @@ static ERRCODE hb_usrInfo( AREAP pArea, USHORT uiInfoType, PHB_ITEM pInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) +static HB_ERRCODE hb_usrEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) { PHB_ITEM pItem; @@ -1677,7 +1677,7 @@ static ERRCODE hb_usrEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrPack( AREAP pArea ) +static HB_ERRCODE hb_usrPack( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrPack(%p)", pArea)); @@ -1690,7 +1690,7 @@ static ERRCODE hb_usrPack( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrPackRec( AREAP pArea, ULONG ulRecNo, BOOL * pWritten ) +static HB_ERRCODE hb_usrPackRec( AREAP pArea, ULONG ulRecNo, BOOL * pWritten ) { LONG lOffset; @@ -1712,13 +1712,13 @@ static ERRCODE hb_usrPackRec( AREAP pArea, ULONG ulRecNo, BOOL * pWritten ) if( hb_xvmPopLogical( pWritten ) ) { hb_ret(); - return FAILURE; + return HB_FAILURE; } return hb_usrReturn(); } -static ERRCODE hb_usrSort( AREAP pArea, LPDBSORTINFO pSortInfo ) +static HB_ERRCODE hb_usrSort( AREAP pArea, LPDBSORTINFO pSortInfo ) { PHB_ITEM pItem; @@ -1737,7 +1737,7 @@ static ERRCODE hb_usrSort( AREAP pArea, LPDBSORTINFO pSortInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) +static HB_ERRCODE hb_usrTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) { PHB_ITEM pItem; @@ -1756,7 +1756,7 @@ static ERRCODE hb_usrTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) +static HB_ERRCODE hb_usrTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) { PHB_ITEM pItem; @@ -1775,7 +1775,7 @@ static ERRCODE hb_usrTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrZap( AREAP pArea ) +static HB_ERRCODE hb_usrZap( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrZap(%p)", pArea)); @@ -1792,7 +1792,7 @@ static ERRCODE hb_usrZap( AREAP pArea ) * Relational Methods */ -static ERRCODE hb_usrChildEnd( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_usrChildEnd( AREAP pArea, LPDBRELINFO pRelInfo ) { PHB_ITEM pItem; @@ -1811,7 +1811,7 @@ static ERRCODE hb_usrChildEnd( AREAP pArea, LPDBRELINFO pRelInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrChildStart( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_usrChildStart( AREAP pArea, LPDBRELINFO pRelInfo ) { PHB_ITEM pItem; @@ -1830,7 +1830,7 @@ static ERRCODE hb_usrChildStart( AREAP pArea, LPDBRELINFO pRelInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrChildSync( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_usrChildSync( AREAP pArea, LPDBRELINFO pRelInfo ) { PHB_ITEM pItem; @@ -1849,7 +1849,7 @@ static ERRCODE hb_usrChildSync( AREAP pArea, LPDBRELINFO pRelInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrSyncChildren( AREAP pArea ) +static HB_ERRCODE hb_usrSyncChildren( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSyncChildren(%p)", pArea)); @@ -1862,7 +1862,7 @@ static ERRCODE hb_usrSyncChildren( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrClearRel( AREAP pArea ) +static HB_ERRCODE hb_usrClearRel( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrClearRel(%p)", pArea)); @@ -1875,7 +1875,7 @@ static ERRCODE hb_usrClearRel( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrForceRel( AREAP pArea ) +static HB_ERRCODE hb_usrForceRel( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrForceRel(%p)", pArea)); @@ -1888,7 +1888,7 @@ static ERRCODE hb_usrForceRel( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrRelArea( AREAP pArea, USHORT uiRelNo, void * pRelArea ) +static HB_ERRCODE hb_usrRelArea( AREAP pArea, USHORT uiRelNo, void * pRelArea ) { LONG lOffset; USHORT * puiRelArea = ( USHORT * ) pRelArea; @@ -1914,7 +1914,7 @@ static ERRCODE hb_usrRelArea( AREAP pArea, USHORT uiRelNo, void * pRelArea ) return hb_usrReturn(); } -static ERRCODE hb_usrRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_usrRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) { PHB_ITEM pItem; @@ -1933,7 +1933,7 @@ static ERRCODE hb_usrRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrRelText( AREAP pArea, USHORT uiRelNo, PHB_ITEM pExpr ) +static HB_ERRCODE hb_usrRelText( AREAP pArea, USHORT uiRelNo, PHB_ITEM pExpr ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrRelText(%p,%hu,%p)", pArea, uiRelNo, pExpr)); @@ -1948,7 +1948,7 @@ static ERRCODE hb_usrRelText( AREAP pArea, USHORT uiRelNo, PHB_ITEM pExpr ) return hb_usrReturn(); } -static ERRCODE hb_usrSetRel( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_usrSetRel( AREAP pArea, LPDBRELINFO pRelInfo ) { PHB_ITEM pItem; @@ -1972,7 +1972,7 @@ static ERRCODE hb_usrSetRel( AREAP pArea, LPDBRELINFO pRelInfo ) * Order Management */ -static ERRCODE hb_usrOrderListAdd( AREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_usrOrderListAdd( AREAP pArea, LPDBORDERINFO pOrderInfo ) { PHB_ITEM pItem, pResult; @@ -2000,7 +2000,7 @@ static ERRCODE hb_usrOrderListAdd( AREAP pArea, LPDBORDERINFO pOrderInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrOrderListClear( AREAP pArea ) +static HB_ERRCODE hb_usrOrderListClear( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrOrderListClear(%p)", pArea)); @@ -2013,7 +2013,7 @@ static ERRCODE hb_usrOrderListClear( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrOrderListDelete( AREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_usrOrderListDelete( AREAP pArea, LPDBORDERINFO pOrderInfo ) { PHB_ITEM pItem, pResult; @@ -2041,7 +2041,7 @@ static ERRCODE hb_usrOrderListDelete( AREAP pArea, LPDBORDERINFO pOrderInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrOrderListFocus( AREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_usrOrderListFocus( AREAP pArea, LPDBORDERINFO pOrderInfo ) { PHB_ITEM pItem, pResult; @@ -2069,7 +2069,7 @@ static ERRCODE hb_usrOrderListFocus( AREAP pArea, LPDBORDERINFO pOrderInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrOrderListRebuild( AREAP pArea ) +static HB_ERRCODE hb_usrOrderListRebuild( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrOrderListRebuild(%p)", pArea)); @@ -2082,7 +2082,7 @@ static ERRCODE hb_usrOrderListRebuild( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrOrderCondition( AREAP pArea, LPDBORDERCONDINFO pOrderCondInfo ) +static HB_ERRCODE hb_usrOrderCondition( AREAP pArea, LPDBORDERCONDINFO pOrderCondInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrOrderCondition(%p,%p)", pArea, pOrderCondInfo)); @@ -2107,7 +2107,7 @@ static ERRCODE hb_usrOrderCondition( AREAP pArea, LPDBORDERCONDINFO pOrderCondIn return hb_usrReturn(); } -static ERRCODE hb_usrOrderCreate( AREAP pArea, LPDBORDERCREATEINFO pOrderCreateInfo ) +static HB_ERRCODE hb_usrOrderCreate( AREAP pArea, LPDBORDERCREATEINFO pOrderCreateInfo ) { PHB_ITEM pItem; @@ -2126,7 +2126,7 @@ static ERRCODE hb_usrOrderCreate( AREAP pArea, LPDBORDERCREATEINFO pOrderCreateI return hb_usrReturn(); } -static ERRCODE hb_usrOrderDestroy( AREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_usrOrderDestroy( AREAP pArea, LPDBORDERINFO pOrderInfo ) { PHB_ITEM pItem, pResult; @@ -2154,7 +2154,7 @@ static ERRCODE hb_usrOrderDestroy( AREAP pArea, LPDBORDERINFO pOrderInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrOrderInfo( AREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_usrOrderInfo( AREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrderInfo ) { PHB_ITEM pItem, pResult; @@ -2188,7 +2188,7 @@ static ERRCODE hb_usrOrderInfo( AREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrde * Filters and Scope Settings */ -static ERRCODE hb_usrClearFilter( AREAP pArea ) +static HB_ERRCODE hb_usrClearFilter( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrClearFilter(%p)", pArea)); @@ -2201,7 +2201,7 @@ static ERRCODE hb_usrClearFilter( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrClearLocate( AREAP pArea ) +static HB_ERRCODE hb_usrClearLocate( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrClearLocate(%p)", pArea)); @@ -2214,7 +2214,7 @@ static ERRCODE hb_usrClearLocate( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrClearScope( AREAP pArea ) +static HB_ERRCODE hb_usrClearScope( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrClearScope(%p)", pArea)); @@ -2227,7 +2227,7 @@ static ERRCODE hb_usrClearScope( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrFilterText( AREAP pArea, PHB_ITEM pFilter ) +static HB_ERRCODE hb_usrFilterText( AREAP pArea, PHB_ITEM pFilter ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrFilterText(%p,%p)", pArea, pFilter)); @@ -2241,7 +2241,7 @@ static ERRCODE hb_usrFilterText( AREAP pArea, PHB_ITEM pFilter ) return hb_usrReturn(); } -static ERRCODE hb_usrSetFilter( AREAP pArea, LPDBFILTERINFO pFilterInfo ) +static HB_ERRCODE hb_usrSetFilter( AREAP pArea, LPDBFILTERINFO pFilterInfo ) { PHB_ITEM pItem; @@ -2260,7 +2260,7 @@ static ERRCODE hb_usrSetFilter( AREAP pArea, LPDBFILTERINFO pFilterInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrSetLocate( AREAP pArea, LPDBSCOPEINFO pScopeInfo ) +static HB_ERRCODE hb_usrSetLocate( AREAP pArea, LPDBSCOPEINFO pScopeInfo ) { PHB_ITEM pItem; @@ -2279,7 +2279,7 @@ static ERRCODE hb_usrSetLocate( AREAP pArea, LPDBSCOPEINFO pScopeInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrLocate( AREAP pArea, BOOL fContinue ) +static HB_ERRCODE hb_usrLocate( AREAP pArea, BOOL fContinue ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrLocate(%p,%d)", pArea, fContinue)); @@ -2298,7 +2298,7 @@ static ERRCODE hb_usrLocate( AREAP pArea, BOOL fContinue ) * Miscellaneous */ -static ERRCODE hb_usrCompile( AREAP pArea, BYTE * szExpr ) +static HB_ERRCODE hb_usrCompile( AREAP pArea, BYTE * szExpr ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrCompile(%p,%p)", pArea, szExpr)); @@ -2312,7 +2312,7 @@ static ERRCODE hb_usrCompile( AREAP pArea, BYTE * szExpr ) return hb_usrReturn(); } -static ERRCODE hb_usrError( AREAP pArea, PHB_ITEM pError ) +static HB_ERRCODE hb_usrError( AREAP pArea, PHB_ITEM pError ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrError(%p,%p)", pArea, pError)); @@ -2333,7 +2333,7 @@ static ERRCODE hb_usrError( AREAP pArea, PHB_ITEM pError ) return hb_usrReturn(); } -static ERRCODE hb_usrEvalBlock( AREAP pArea, PHB_ITEM pBlock ) +static HB_ERRCODE hb_usrEvalBlock( AREAP pArea, PHB_ITEM pBlock ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrEvalBlock(%p,%p)", pArea, pBlock)); @@ -2351,8 +2351,8 @@ static ERRCODE hb_usrEvalBlock( AREAP pArea, PHB_ITEM pBlock ) /* * Network operations */ - -static ERRCODE hb_usrRawLock( AREAP pArea, USHORT uiAction, ULONG ulRecNo ) + +static HB_ERRCODE hb_usrRawLock( AREAP pArea, USHORT uiAction, ULONG ulRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrRawLock(%p,%hu,%lu)", pArea, uiAction, ulRecNo)); @@ -2367,7 +2367,7 @@ static ERRCODE hb_usrRawLock( AREAP pArea, USHORT uiAction, ULONG ulRecNo ) return hb_usrReturn(); } -static ERRCODE hb_usrLock( AREAP pArea, LPDBLOCKINFO pLockInfo ) +static HB_ERRCODE hb_usrLock( AREAP pArea, LPDBLOCKINFO pLockInfo ) { PHB_ITEM pItem; @@ -2388,7 +2388,7 @@ static ERRCODE hb_usrLock( AREAP pArea, LPDBLOCKINFO pLockInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrUnLock( AREAP pArea, PHB_ITEM pRecNo ) +static HB_ERRCODE hb_usrUnLock( AREAP pArea, PHB_ITEM pRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrUnLock(%p,%p)", pArea, pRecNo)); @@ -2410,7 +2410,7 @@ static ERRCODE hb_usrUnLock( AREAP pArea, PHB_ITEM pRecNo ) * Memofile functions */ -static ERRCODE hb_usrCloseMemFile( AREAP pArea ) +static HB_ERRCODE hb_usrCloseMemFile( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrCloseMemFile(%p)", pArea)); @@ -2423,7 +2423,7 @@ static ERRCODE hb_usrCloseMemFile( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrCreateMemFile( AREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_usrCreateMemFile( AREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pItem; @@ -2442,7 +2442,7 @@ static ERRCODE hb_usrCreateMemFile( AREAP pArea, LPDBOPENINFO pOpenInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrOpenMemFile( AREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_usrOpenMemFile( AREAP pArea, LPDBOPENINFO pOpenInfo ) { PHB_ITEM pItem; @@ -2461,7 +2461,7 @@ static ERRCODE hb_usrOpenMemFile( AREAP pArea, LPDBOPENINFO pOpenInfo ) return hb_usrReturn(); } -static ERRCODE hb_usrGetValueFile( AREAP pArea, USHORT uiIndex, void * szFile, USHORT uiMode ) +static HB_ERRCODE hb_usrGetValueFile( AREAP pArea, USHORT uiIndex, void * szFile, USHORT uiMode ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrGetValueFile(%p,%hu,%p,%hu)", pArea, uiIndex, szFile, uiMode)); @@ -2477,7 +2477,7 @@ static ERRCODE hb_usrGetValueFile( AREAP pArea, USHORT uiIndex, void * szFile, U return hb_usrReturn(); } -static ERRCODE hb_usrPutValueFile( AREAP pArea, USHORT uiIndex, void * szFile, USHORT uiMode ) +static HB_ERRCODE hb_usrPutValueFile( AREAP pArea, USHORT uiIndex, void * szFile, USHORT uiMode ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrPutValueFile(%p,%hu,%p,%hu)", pArea, uiIndex, szFile, uiMode)); @@ -2498,7 +2498,7 @@ static ERRCODE hb_usrPutValueFile( AREAP pArea, USHORT uiIndex, void * szFile, U * Database file header handling */ -static ERRCODE hb_usrReadDBHeader( AREAP pArea ) +static HB_ERRCODE hb_usrReadDBHeader( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrReadDBHeader(%p)", pArea)); @@ -2511,7 +2511,7 @@ static ERRCODE hb_usrReadDBHeader( AREAP pArea ) return hb_usrReturn(); } -static ERRCODE hb_usrWriteDBHeader( AREAP pArea ) +static HB_ERRCODE hb_usrWriteDBHeader( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrWriteDBHeader(%p)", pArea)); @@ -2529,7 +2529,7 @@ static ERRCODE hb_usrWriteDBHeader( AREAP pArea ) * non WorkArea functions */ -static ERRCODE hb_usrDrop( LPRDDNODE pRDD, PHB_ITEM pTable, PHB_ITEM pIndex, ULONG ulConnection ) +static HB_ERRCODE hb_usrDrop( LPRDDNODE pRDD, PHB_ITEM pTable, PHB_ITEM pIndex, ULONG ulConnection ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrDrop(%p,%p,%p,%lu)", pRDD, pTable, pIndex, ulConnection)); @@ -2545,7 +2545,7 @@ static ERRCODE hb_usrDrop( LPRDDNODE pRDD, PHB_ITEM pTable, PHB_ITEM pIndex, ULO return hb_usrReturn(); } -static ERRCODE hb_usrExists( LPRDDNODE pRDD, PHB_ITEM pTable, PHB_ITEM pIndex, ULONG ulConnection ) +static HB_ERRCODE hb_usrExists( LPRDDNODE pRDD, PHB_ITEM pTable, PHB_ITEM pIndex, ULONG ulConnection ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrExists(%p,%p,%p,%lu)", pRDD, pTable, pIndex, ulConnection)); @@ -2561,7 +2561,7 @@ static ERRCODE hb_usrExists( LPRDDNODE pRDD, PHB_ITEM pTable, PHB_ITEM pIndex, U return hb_usrReturn(); } -static ERRCODE hb_usrRddInfo( LPRDDNODE pRDD, USHORT uiInfoType, ULONG ulConnection, PHB_ITEM pInfo ) +static HB_ERRCODE hb_usrRddInfo( LPRDDNODE pRDD, USHORT uiInfoType, ULONG ulConnection, PHB_ITEM pInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrRddInfo(%p,%hu,%lu,%p)", pRDD, uiInfoType, ulConnection, pInfo)); @@ -2872,14 +2872,14 @@ HB_FUNC( USRRDD_GETFUNCTABLE ) ++pFunction; } uiResult = hb_rddInherit( pSelfTable, &funcTable, pSuperTable, szSuperRDD ); - if( uiResult == SUCCESS ) + if( uiResult == HB_SUCCESS ) { pSelfTable->whoCares = ( DBENTRYP_SVP ) hb_itemNew( pMethods ); } hb_retni( uiResult ); } else - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } HB_FUNC( USRRDD_RDDDATA ) @@ -3034,10 +3034,10 @@ HB_FUNC( USRRDD_SETBOTTOM ) } } -static ERRCODE hb_usrErrorRT( AREAP pArea, USHORT uiGenCode, USHORT uiSubCode ) +static HB_ERRCODE hb_usrErrorRT( AREAP pArea, USHORT uiGenCode, USHORT uiSubCode ) { PHB_ITEM pError; - ERRCODE iRet = FAILURE; + HB_ERRCODE iRet = HB_FAILURE; if( hb_vmRequestQuery() == 0 ) { @@ -3076,7 +3076,7 @@ static AREAP hb_usrGetAreaParam( int iParams ) else hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); return NULL; } @@ -3101,7 +3101,7 @@ static LPRDDNODE hb_usrGetNodeParam( int iParams ) else hb_usrErrorRT( NULL, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); return NULL; } @@ -3242,7 +3242,7 @@ HB_FUNC_UR_SUPER( ADDFIELD ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3262,7 +3262,7 @@ HB_FUNC_UR_SUPER( FIELDDISPLAY ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3359,7 +3359,7 @@ HB_FUNC_UR_SUPER( PUTREC ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3510,7 +3510,7 @@ HB_FUNC_UR_SUPER( CREATE ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3530,7 +3530,7 @@ HB_FUNC_UR_SUPER( OPEN ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3558,7 +3558,7 @@ HB_FUNC_UR_SUPER( DBEVAL ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3600,7 +3600,7 @@ HB_FUNC_UR_SUPER( SORT ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3621,7 +3621,7 @@ HB_FUNC_UR_SUPER( TRANS ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3642,7 +3642,7 @@ HB_FUNC_UR_SUPER( TRANSREC ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3670,7 +3670,7 @@ HB_FUNC_UR_SUPER( CHILDEND ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3690,7 +3690,7 @@ HB_FUNC_UR_SUPER( CHILDSTART ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3710,7 +3710,7 @@ HB_FUNC_UR_SUPER( CHILDSYNC ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3767,7 +3767,7 @@ HB_FUNC_UR_SUPER( RELEVAL ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3795,7 +3795,7 @@ HB_FUNC_UR_SUPER( SETREL ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3817,7 +3817,7 @@ HB_FUNC_UR_SUPER( ORDLSTADD ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3847,7 +3847,7 @@ HB_FUNC_UR_SUPER( ORDLSTDELETE ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3869,7 +3869,7 @@ HB_FUNC_UR_SUPER( ORDLSTFOCUS ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3907,7 +3907,7 @@ HB_FUNC_UR_SUPER( ORDSETCOND ) { hb_xfree( lpdbOrderCondInfo ); hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3930,7 +3930,7 @@ HB_FUNC_UR_SUPER( ORDCREATE ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3952,7 +3952,7 @@ HB_FUNC_UR_SUPER( ORDDESTROY ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -3974,7 +3974,7 @@ HB_FUNC_UR_SUPER( ORDINFO ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4026,7 +4026,7 @@ HB_FUNC_UR_SUPER( SETFILTER ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4046,7 +4046,7 @@ HB_FUNC_UR_SUPER( SETLOCATE ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4072,7 +4072,7 @@ HB_FUNC_UR_SUPER( COMPILE ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4094,7 +4094,7 @@ HB_FUNC_UR_SUPER( ERROR ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4114,7 +4114,7 @@ HB_FUNC_UR_SUPER( EVALBLOCK ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4145,7 +4145,7 @@ HB_FUNC_UR_SUPER( LOCK ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4181,7 +4181,7 @@ HB_FUNC_UR_SUPER( CREATEMEMFILE ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4201,7 +4201,7 @@ HB_FUNC_UR_SUPER( OPENMEMFILE ) else { hb_usrErrorRT( pArea, EG_ARG, EDBCMD_NOVAR ); - hb_retni( FAILURE ); + hb_retni( HB_FAILURE ); } } } @@ -4268,4 +4268,3 @@ HB_FUNC_UR_SUPER( RDDINFO ) hb_retni( SUPER_RDDINFO( pRDD, hb_parni( 2 ), hb_parnl( 3 ), hb_param( 4, HB_IT_ANY ) ) ); } - diff --git a/harbour/source/rdd/wacore.c b/harbour/source/rdd/wacore.c index a27dddba05..254152e519 100644 --- a/harbour/source/rdd/wacore.c +++ b/harbour/source/rdd/wacore.c @@ -166,7 +166,7 @@ static void hb_waNodeDelete( PHB_STACKRDD pRddInfo ) /* * Return the next free WorkArea for later use. */ -ERRCODE hb_rddSelectFirstAvailable( void ) +HB_ERRCODE hb_rddSelectFirstAvailable( void ) { PHB_STACKRDD pRddInfo; USHORT uiArea; @@ -183,9 +183,9 @@ ERRCODE hb_rddSelectFirstAvailable( void ) uiArea++; } if( uiArea >= HB_RDD_MAX_AREA_NUM ) - return FAILURE; + return HB_FAILURE; HB_SET_WA( uiArea ); - return SUCCESS; + return HB_SUCCESS; } /* @@ -214,7 +214,7 @@ USHORT hb_rddInsertAreaNode( const char *szDriver ) if( pRddInfo->uiCurrArea == 0 ) { - if( hb_rddSelectFirstAvailable() != SUCCESS ) + if( hb_rddSelectFirstAvailable() != HB_SUCCESS ) return 0; } @@ -239,7 +239,7 @@ void hb_rddReleaseCurrentArea( void ) if( !pArea ) return; - if( SELF_CLOSE( pArea ) == FAILURE ) + if( SELF_CLOSE( pArea ) == HB_FAILURE ) return; SELF_RELEASE( pArea ); @@ -330,10 +330,10 @@ void hb_rddUnLockAll( void ) /* * call a pCallBack function with all open workareas ### */ -ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ) +HB_ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ) { PHB_STACKRDD pRddInfo; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; USHORT uiIndex; HB_TRACE(HB_TR_DEBUG, ("hb_rddIterateWorkAreas(%p,%p)", pCallBack, cargo)); @@ -342,7 +342,7 @@ ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ) for( uiIndex = 1; uiIndex < pRddInfo->uiWaMax; uiIndex++ ) { errCode = pCallBack( ( AREAP ) pRddInfo->waList[ uiIndex ], cargo ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; } return errCode; @@ -437,7 +437,7 @@ int hb_rddGetCurrentWorkAreaNumber( void ) /* * Select a WorkArea by the number. */ -ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) +HB_ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) { PHB_STACKRDD pRddInfo; @@ -449,7 +449,7 @@ ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) else HB_SET_WA( iArea ); - return ( pRddInfo->pCurrArea == NULL ) ? FAILURE : SUCCESS; + return ( pRddInfo->pCurrArea == NULL ) ? HB_FAILURE : HB_SUCCESS; } @@ -500,7 +500,7 @@ void hb_rddCloseDetachedAreas( void ) hb_itemRelease( pDetachedArea ); } -ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ) +HB_ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ) { AREAP * pHolder; PHB_ITEM pDetachedArea; @@ -560,7 +560,7 @@ ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ) /* leave critical section */ hb_threadLeaveCriticalSection( &s_waMtx ); - return SUCCESS; + return HB_SUCCESS; } AREAP hb_rddRequestArea( char * szAlias, PHB_ITEM pCargo, @@ -577,7 +577,7 @@ AREAP hb_rddRequestArea( char * szAlias, PHB_ITEM pCargo, { hb_rddReleaseCurrentArea(); } - else if( hb_rddSelectFirstAvailable() != SUCCESS ) + else if( hb_rddSelectFirstAvailable() != HB_SUCCESS ) { hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return NULL; @@ -588,7 +588,7 @@ AREAP hb_rddRequestArea( char * szAlias, PHB_ITEM pCargo, pSymAlias = hb_dynsymFindName( szAlias ); /* verify if the alias name is valid symbol */ - if( hb_rddVerifyAliasName( szAlias ) != SUCCESS ) + if( hb_rddVerifyAliasName( szAlias ) != HB_SUCCESS ) { hb_errRT_DBCMD_Ext( EG_BADALIAS, EDBCMD_BADALIAS, NULL, szAlias, EF_CANDEFAULT ); return NULL; diff --git a/harbour/source/rdd/wafunc.c b/harbour/source/rdd/wafunc.c index 2aab502c08..a861a39114 100644 --- a/harbour/source/rdd/wafunc.c +++ b/harbour/source/rdd/wafunc.c @@ -61,7 +61,7 @@ /* * check if a given name can be used as alias expression */ -ERRCODE hb_rddVerifyAliasName( const char * szAlias ) +HB_ERRCODE hb_rddVerifyAliasName( const char * szAlias ) { char c; @@ -88,14 +88,14 @@ ERRCODE hb_rddVerifyAliasName( const char * szAlias ) if( ! *szAlias ) break; } - return FAILURE; + return HB_FAILURE; } c = *(++szAlias); } - return SUCCESS; + return HB_SUCCESS; } } - return FAILURE; + return HB_FAILURE; } /* @@ -116,7 +116,7 @@ void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ) pArea->lprfsHost = &pRddNode->pTable; pArea->rddID = uiRddID; - if( SELF_STRUCTSIZE( pArea, &uiSize ) != SUCCESS ) + if( SELF_STRUCTSIZE( pArea, &uiSize ) != HB_SUCCESS ) return NULL; /* Need more space? */ @@ -138,7 +138,7 @@ void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ) pArea->rddID = uiRddID; } - if( SELF_NEW( pArea ) != SUCCESS ) + if( SELF_NEW( pArea ) != HB_SUCCESS ) { SELF_RELEASE( pArea ); return NULL; @@ -147,18 +147,18 @@ void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ) return ( void * ) pArea; } -ERRCODE hb_rddGetTempAlias( char * szAliasTmp ) +HB_ERRCODE hb_rddGetTempAlias( char * szAliasTmp ) { int i, iArea; for( i = 1; i < 1000; i++ ) { hb_snprintf( szAliasTmp, 11, "__HBTMP%03i", i); - if( hb_rddGetAliasNumber( szAliasTmp, &iArea ) != SUCCESS ) - return SUCCESS; + if( hb_rddGetAliasNumber( szAliasTmp, &iArea ) != HB_SUCCESS ) + return HB_SUCCESS; } szAliasTmp[0] = '\0'; - return FAILURE; + return HB_FAILURE; } /* @@ -172,13 +172,13 @@ void * hb_rddAllocWorkAreaAlias( const char * szAlias, int iArea ) HB_TRACE(HB_TR_DEBUG, ("hb_rddAllocWorkAreaAlias(%s, %d)", szAlias, iArea)); /* Verify if the alias name is valid symbol */ - if( hb_rddVerifyAliasName( szAlias ) != SUCCESS ) + if( hb_rddVerifyAliasName( szAlias ) != HB_SUCCESS ) { hb_errRT_DBCMD_Ext( EG_BADALIAS, EDBCMD_BADALIAS, NULL, szAlias, EF_CANDEFAULT ); return NULL; } /* Verify if the alias is already in use */ - if( hb_rddGetAliasNumber( szAlias, &iDummyArea ) == SUCCESS ) + if( hb_rddGetAliasNumber( szAlias, &iDummyArea ) == HB_SUCCESS ) { hb_errRT_DBCMD_Ext( EG_DUPALIAS, EDBCMD_DUPALIAS, NULL, szAlias, EF_CANDEFAULT ); return NULL; @@ -253,7 +253,7 @@ USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField ) int i, j, l; n = 0; - if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == SUCCESS ) + if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == HB_SUCCESS ) l = strlen( szAlias ); else l = 0; @@ -303,9 +303,9 @@ USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField ) } /* - * Find a WorkArea by the alias, return FAILURE if not found + * Find a WorkArea by the alias, return HB_FAILURE if not found */ -ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) +HB_ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) { BOOL fOneLetter; char c; @@ -343,20 +343,20 @@ ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) *iArea = pSymAlias ? ( int ) hb_dynsymAreaHandle( pSymAlias ) : 0; if( *iArea == 0 ) { - return FAILURE; + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Select a WorkArea by the symbol name. */ -ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) +HB_ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) { HB_ITEM_PTR pError; - ERRCODE errCode; + HB_ERRCODE errCode; const char * szName; int iArea; @@ -366,7 +366,7 @@ ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) if( iArea ) { hb_rddSelectWorkAreaNumber( iArea ); - return SUCCESS; + return HB_SUCCESS; } szName = hb_dynsymName( pSymAlias->pDynSym ); @@ -376,17 +376,17 @@ ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) if( szName[ 0 ] >= 'A' && szName[ 0 ] <= 'K' ) { hb_rddSelectWorkAreaNumber( szName[ 0 ] - 'A' + 1 ); - return SUCCESS; + return HB_SUCCESS; } else if( szName[ 0 ] >= 'a' && szName[ 0 ] <= 'k' ) { hb_rddSelectWorkAreaNumber( szName[ 0 ] - 'a' + 1 ); - return SUCCESS; + return HB_SUCCESS; } else if( szName[ 0 ] == 'M' || szName[ 0 ] == 'm' ) { hb_rddSelectWorkAreaNumber( HB_RDD_MAX_AREA_NUM ); - return SUCCESS; + return HB_SUCCESS; } } @@ -396,7 +396,7 @@ ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) */ pError = hb_errRT_New( ES_ERROR, NULL, EG_NOALIAS, EDBCMD_NOALIAS, NULL, pSymAlias->szName, 0, EF_CANRETRY ); - errCode = FAILURE; + errCode = HB_FAILURE; do { @@ -406,10 +406,10 @@ ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) if( iArea ) { hb_rddSelectWorkAreaNumber( iArea ); - errCode = SUCCESS; + errCode = HB_SUCCESS; } } - while( errCode == FAILURE ); + while( errCode == HB_FAILURE ); hb_itemRelease( pError ); @@ -419,16 +419,16 @@ ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) /* * Select a WorkArea by the name. */ -ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ) +HB_ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ) { - ERRCODE errCode; + HB_ERRCODE errCode; int iArea; HB_TRACE(HB_TR_DEBUG, ("hb_rddSelectWorkAreaAlias(%s)", szAlias)); errCode = hb_rddGetAliasNumber( szAlias, &iArea ); - if( errCode == FAILURE ) + if( errCode == HB_FAILURE ) { /* * generate an error with retry possibility @@ -442,12 +442,12 @@ ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ) break; errCode = hb_rddGetAliasNumber( szAlias, &iArea ); } - while( errCode == FAILURE ); + while( errCode == HB_FAILURE ); hb_itemRelease( pError ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { if( iArea < 1 || iArea > HB_RDD_MAX_AREA_NUM ) errCode = hb_rddSelectFirstAvailable(); @@ -461,7 +461,7 @@ ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ) /* * Obtain the current value of a field. */ -ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { AREAP pArea; @@ -484,13 +484,13 @@ ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) pField = pField->lpfNext; } } - return FAILURE; + return HB_FAILURE; } /* * Assign a value to a field. */ -ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { AREAP pArea; @@ -513,21 +513,21 @@ ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) pField = pField->lpfNext; } } - return FAILURE; + return HB_FAILURE; } /* * Obtain the current value of a field. */ -ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_rddGetFieldValue(%p, %p)", pItem, pFieldSymbol)); errCode = hb_rddFieldGet( pItem, pFieldSymbol ); - if( errCode == FAILURE && hb_vmRequestQuery() == 0 ) + if( errCode == HB_FAILURE && hb_vmRequestQuery() == 0 ) { /* * generate an error with retry possibility @@ -540,7 +540,7 @@ ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { errCode = hb_rddFieldGet( pItem, pFieldSymbol ); - if( errCode == SUCCESS || hb_vmRequestQuery() != 0 ) + if( errCode == HB_SUCCESS || hb_vmRequestQuery() != 0 ) break; } hb_itemRelease( pError ); @@ -552,15 +552,15 @@ ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) /* * Assign a value to a field. */ -ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +HB_ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_rddPutFieldValue(%p, %p)", pItem, pFieldSymbol)); errCode = hb_rddFieldPut( pItem, pFieldSymbol ); - if( errCode == FAILURE && hb_vmRequestQuery() == 0 ) + if( errCode == HB_FAILURE && hb_vmRequestQuery() == 0 ) { /* * generate an error with retry possibility @@ -573,7 +573,7 @@ ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { errCode = hb_rddFieldPut( pItem, pFieldSymbol ); - if( errCode == SUCCESS || hb_vmRequestQuery() != 0 ) + if( errCode == HB_SUCCESS || hb_vmRequestQuery() != 0 ) break; } hb_itemRelease( pError ); @@ -582,7 +582,7 @@ ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) return errCode; } -ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, +HB_ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, USHORT uiArea, const char *szAlias, BOOL fShared, BOOL fReadonly, const char * szCpId, ULONG ulConnection, @@ -590,7 +590,7 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, { char szDriverBuffer[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ]; DBOPENINFO pInfo; - ERRCODE errCode; + HB_ERRCODE errCode; AREAP pArea; /* uiArea = 0 in hb_rddInsertAreaNode() means chose first @@ -629,7 +629,7 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, if( ! hb_rddInsertAreaNode( szDriver ) ) { hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); - return FAILURE; + return HB_FAILURE; } /* Then check if valid file name was given - Clipper allows to use empty @@ -639,7 +639,7 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, { hb_rddReleaseCurrentArea(); hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); - return FAILURE; + return HB_FAILURE; } pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); @@ -654,23 +654,23 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, pInfo.ulConnection = ulConnection; pInfo.lpdbHeader = NULL; - errCode = pStruct ? SELF_CREATEFIELDS( pArea, pStruct ) : SUCCESS; - if( errCode == SUCCESS ) + errCode = pStruct ? SELF_CREATEFIELDS( pArea, pStruct ) : HB_SUCCESS; + if( errCode == HB_SUCCESS ) { if( pDelim && !HB_IS_NIL( pDelim ) ) errCode = SELF_INFO( pArea, DBI_SETDELIMITER, pDelim ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) /* Open file */ errCode = SELF_OPEN( pArea, &pInfo ); } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) hb_rddReleaseCurrentArea(); return errCode; } -ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver, +HB_ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver, USHORT uiArea, const char *szAlias, BOOL fKeepOpen, const char * szCpId, ULONG ulConnection, @@ -678,14 +678,14 @@ ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver, { char szDriverBuffer[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ]; DBOPENINFO pInfo; - ERRCODE errCode; + HB_ERRCODE errCode; USHORT uiPrevArea; AREAP pArea; if( !szFileName ) { hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); - return FAILURE; + return HB_FAILURE; } if( szDriver && szDriver[ 0 ] ) @@ -713,7 +713,7 @@ ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver, { hb_rddSelectWorkAreaNumber( uiPrevArea ); hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); - return FAILURE; + return HB_FAILURE; } pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); @@ -730,16 +730,16 @@ ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver, if( pDelim && !HB_IS_NIL( pDelim ) ) errCode = SELF_INFO( pArea, DBI_SETDELIMITER, pDelim ); else - errCode = SUCCESS; + errCode = HB_SUCCESS; - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = SELF_CREATEFIELDS( pArea, pStruct ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_CREATE( pArea, &pInfo ); } - if( !fKeepOpen || errCode != SUCCESS ) + if( !fKeepOpen || errCode != HB_SUCCESS ) { hb_rddReleaseCurrentArea(); hb_rddSelectWorkAreaNumber( uiPrevArea ); @@ -776,7 +776,7 @@ void hb_tblStructure( AREAP pArea, PHB_ITEM pStruct, USHORT uiSize ) { USHORT uiFields, uiCount; - if( SELF_FIELDCOUNT( pArea, &uiFields ) == SUCCESS ) + if( SELF_FIELDCOUNT( pArea, &uiFields ) == HB_SUCCESS ) { if( hb_arraySize( pStruct, uiFields ) ) { @@ -809,23 +809,23 @@ static char * hb_dbTransFieldPos( PHB_ITEM pFields, USHORT uiField ) return szField; } -ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, +HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, LPDBTRANSINFO lpdbTransInfo, PHB_ITEM *pStruct, PHB_ITEM pFields ) { USHORT uiFields, uiSize, uiCount, uiPosSrc, uiPosDst, uiSizeSrc, uiSizeDst; - ERRCODE errCode; + HB_ERRCODE errCode; char * szField; BOOL fAll; errCode = SELF_FIELDCOUNT( lpaSource, &uiSizeSrc ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( lpaDest ) { errCode = SELF_FIELDCOUNT( lpaDest, &uiSizeDst ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; uiSize = HB_MIN( uiSizeDst, uiSizeSrc ); } @@ -835,7 +835,7 @@ ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, } if( !uiSize ) - return FAILURE; + return HB_FAILURE; if( hb_itemType( pFields ) & HB_IT_ARRAY ) { uiFields = ( USHORT ) hb_arrayLen( pFields ); @@ -866,7 +866,7 @@ ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, uiSize = 0; for( uiCount = 1; uiCount <= uiSizeSrc; ++uiCount ) { - if( SELF_FIELDINFO( lpaSource, uiCount, DBS_NAME, pItem ) != SUCCESS ) + if( SELF_FIELDINFO( lpaSource, uiCount, DBS_NAME, pItem ) != HB_SUCCESS ) { uiSize = 0; break; @@ -951,8 +951,8 @@ ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, */ for( uiCount = 1; uiCount <= uiSize; ++uiCount ) { - if( SELF_FIELDINFO( lpaSource, uiCount, DBS_TYPE, pSrcItm ) != SUCCESS || - SELF_FIELDINFO( lpaDest, uiCount, DBS_TYPE, pDstItm ) != SUCCESS ) + if( SELF_FIELDINFO( lpaSource, uiCount, DBS_TYPE, pSrcItm ) != HB_SUCCESS || + SELF_FIELDINFO( lpaDest, uiCount, DBS_TYPE, pDstItm ) != HB_SUCCESS ) { uiSize = 0; break; @@ -963,8 +963,8 @@ ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, fAll = FALSE; break; } - if( SELF_FIELDINFO( lpaSource, uiCount, DBS_LEN, pSrcItm ) != SUCCESS || - SELF_FIELDINFO( lpaDest, uiCount, DBS_LEN, pDstItm ) != SUCCESS ) + if( SELF_FIELDINFO( lpaSource, uiCount, DBS_LEN, pSrcItm ) != HB_SUCCESS || + SELF_FIELDINFO( lpaDest, uiCount, DBS_LEN, pDstItm ) != HB_SUCCESS ) { uiSize = 0; break; @@ -974,8 +974,8 @@ ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, fAll = FALSE; break; } - if( SELF_FIELDINFO( lpaSource, uiCount, DBS_DEC, pSrcItm ) != SUCCESS || - SELF_FIELDINFO( lpaDest, uiCount, DBS_DEC, pDstItm ) != SUCCESS ) + if( SELF_FIELDINFO( lpaSource, uiCount, DBS_DEC, pSrcItm ) != HB_SUCCESS || + SELF_FIELDINFO( lpaDest, uiCount, DBS_DEC, pDstItm ) != HB_SUCCESS ) { uiSize = 0; break; @@ -986,8 +986,8 @@ ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, break; } #ifdef DBS_FLAG - if( SELF_FIELDINFO( lpaSource, uiCount, DBS_FLAG, pSrcItm ) != SUCCESS || - SELF_FIELDINFO( lpaDest, uiCount, DBS_FLAG, pDstItm ) != SUCCESS ) + if( SELF_FIELDINFO( lpaSource, uiCount, DBS_FLAG, pSrcItm ) != HB_SUCCESS || + SELF_FIELDINFO( lpaDest, uiCount, DBS_FLAG, pDstItm ) != HB_SUCCESS ) { uiSize = 0; break; @@ -1006,10 +1006,10 @@ ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest, lpdbTransInfo->uiFlags = fAll ? DBTF_MATCH : 0; lpdbTransInfo->uiItemCount = uiSize; - return uiSize ? SUCCESS : FAILURE; + return uiSize ? HB_SUCCESS : HB_FAILURE; } -ERRCODE hb_rddTransRecords( AREAP pArea, +HB_ERRCODE hb_rddTransRecords( AREAP pArea, const char *szFileName, const char *szDriver, ULONG ulConnection, PHB_ITEM pFields, BOOL fExport, @@ -1024,7 +1024,7 @@ ERRCODE hb_rddTransRecords( AREAP pArea, PHB_ITEM pStruct = NULL; DBTRANSINFO dbTransInfo; USHORT uiPrevArea, uiCount, uiSwap; - ERRCODE errCode; + HB_ERRCODE errCode; memset( &dbTransInfo, 0, sizeof( DBTRANSINFO ) ); uiPrevArea = hb_rddGetCurrentWorkAreaNumber(); @@ -1037,12 +1037,12 @@ ERRCODE hb_rddTransRecords( AREAP pArea, { errCode = hb_dbTransStruct( pArea, NULL, &dbTransInfo, &pStruct, pFields ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = hb_rddCreateTable( szFileName, szDriver, 0, "", TRUE, szCpId, ulConnection, pStruct, pDelim ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { dbTransInfo.lpaDest = lpaClose = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); @@ -1056,7 +1056,7 @@ ERRCODE hb_rddTransRecords( AREAP pArea, if( !pRddNode ) { hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); - return FAILURE; + return HB_FAILURE; } if( pRddNode->uiType == RDT_TRANSFER ) @@ -1074,11 +1074,11 @@ ERRCODE hb_rddTransRecords( AREAP pArea, dbTransInfo.lpTransItems[uiCount].uiDest = uiSwap; } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { errCode = hb_rddOpenTable( szFileName, szDriver, 0, "", TRUE, TRUE, szCpId, ulConnection, pStruct, pDelim ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { lpaClose = dbTransInfo.lpaSource = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); @@ -1089,7 +1089,7 @@ ERRCODE hb_rddTransRecords( AREAP pArea, { errCode = hb_rddOpenTable( szFileName, szDriver, 0, "", TRUE, TRUE, szCpId, ulConnection, NULL, pDelim ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { lpaClose = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); errCode = hb_dbTransStruct( lpaClose, pArea, &dbTransInfo, @@ -1101,7 +1101,7 @@ ERRCODE hb_rddTransRecords( AREAP pArea, if( pStruct ) hb_itemRelease( pStruct ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { hb_rddSelectWorkAreaNumber( dbTransInfo.lpaSource->uiArea ); @@ -1134,7 +1134,7 @@ ERRCODE hb_rddTransRecords( AREAP pArea, return errCode; } -static ERRCODE hb_rddCloseParentRel( AREAP pArea, void * pChildArea ) +static HB_ERRCODE hb_rddCloseParentRel( AREAP pArea, void * pChildArea ) { if( pArea->lpdbRelations ) { @@ -1163,13 +1163,13 @@ static ERRCODE hb_rddCloseParentRel( AREAP pArea, void * pChildArea ) } while ( *lpdbRelationPtr ); } - return SUCCESS; + return HB_SUCCESS; } /* close all parent relations */ -ERRCODE hb_rddCloseAllParentRelations( AREAP pArea ) +HB_ERRCODE hb_rddCloseAllParentRelations( AREAP pArea ) { - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; HB_TRACE(HB_TR_DEBUG, ("hb_rddCloseAllParentRelations(%p)", pArea)); diff --git a/harbour/source/rdd/workarea.c b/harbour/source/rdd/workarea.c index 9b3d0d8c1c..df7a372cdc 100644 --- a/harbour/source/rdd/workarea.c +++ b/harbour/source/rdd/workarea.c @@ -74,40 +74,40 @@ /* * Determine logical beginning of file. */ -static ERRCODE hb_waBof( AREAP pArea, BOOL * pBof ) +static HB_ERRCODE hb_waBof( AREAP pArea, BOOL * pBof ) { HB_TRACE(HB_TR_DEBUG, ("hb_waBof(%p, %p)", pArea, pBof)); * pBof = pArea->fBof; - return SUCCESS; + return HB_SUCCESS; } /* * Determine logical end of file. */ -static ERRCODE hb_waEof( AREAP pArea, BOOL * pEof ) +static HB_ERRCODE hb_waEof( AREAP pArea, BOOL * pEof ) { HB_TRACE(HB_TR_DEBUG, ("hb_waEof(%p, %p)", pArea, pEof)); * pEof = pArea->fEof; - return SUCCESS; + return HB_SUCCESS; } /* * Determine outcome of the last search operation. */ -static ERRCODE hb_waFound( AREAP pArea, BOOL * pFound ) +static HB_ERRCODE hb_waFound( AREAP pArea, BOOL * pFound ) { HB_TRACE(HB_TR_DEBUG, ("hb_waFound(%p, %p)", pArea, pFound)); * pFound = pArea->fFound; - return SUCCESS; + return HB_SUCCESS; } /* * Reposition cursor relative to current position. */ -static ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip ) { LONG lSkip; @@ -128,10 +128,10 @@ static ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip ) } while( --lToSkip >= 0 ) { - if( SELF_SKIPRAW( pArea, lSkip ) != SUCCESS ) - return FAILURE; - if( SELF_SKIPFILTER( pArea, lSkip ) != SUCCESS ) - return FAILURE; + if( SELF_SKIPRAW( pArea, lSkip ) != HB_SUCCESS ) + return HB_FAILURE; + if( SELF_SKIPFILTER( pArea, lSkip ) != HB_SUCCESS ) + return HB_FAILURE; if( pArea->fBof || pArea->fEof ) break; } @@ -142,21 +142,21 @@ static ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip ) else /* ( lSkip > 0 ) */ pArea->fBof = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * Reposition cursor respecting any filter setting. */ -static ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown ) +static HB_ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown ) { BOOL fBottom, fDeleted; - ERRCODE uiError; + HB_ERRCODE uiError; HB_TRACE(HB_TR_DEBUG, ("hb_waSkipFilter(%p, %ld)", pArea, lUpDown)); if( pArea->dbfi.itmCobExpr == NULL && !hb_setGetDeleted() ) - return SUCCESS; + return HB_SUCCESS; /* Since lToSkip is passed to SkipRaw, it should never request more than a single skip. @@ -173,12 +173,12 @@ static ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown ) /* SET DELETED */ if( hb_setGetDeleted() ) { - if( SELF_DELETED( pArea, &fDeleted ) != SUCCESS ) - return FAILURE; + if( SELF_DELETED( pArea, &fDeleted ) != HB_SUCCESS ) + return HB_FAILURE; if( fDeleted ) { - if( SELF_SKIPRAW( pArea, lUpDown ) != SUCCESS ) - return FAILURE; + if( SELF_SKIPRAW( pArea, lUpDown ) != HB_SUCCESS ) + return HB_FAILURE; continue; } } @@ -186,14 +186,14 @@ static ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown ) /* SET FILTER TO */ if( pArea->dbfi.itmCobExpr ) { - if( SELF_EVALBLOCK( pArea, pArea->dbfi.itmCobExpr ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pArea->dbfi.itmCobExpr ) != HB_SUCCESS ) + return HB_FAILURE; if( HB_IS_LOGICAL( pArea->valResult ) && !hb_itemGetL( pArea->valResult ) ) { - if( SELF_SKIPRAW( pArea, lUpDown ) != SUCCESS ) - return FAILURE; + if( SELF_SKIPRAW( pArea, lUpDown ) != HB_SUCCESS ) + return HB_FAILURE; continue; } } @@ -229,7 +229,7 @@ static ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown ) } else { - uiError = SUCCESS; + uiError = HB_SUCCESS; } return uiError; @@ -238,7 +238,7 @@ static ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown ) /* * Add a field to the WorkArea. */ -static ERRCODE hb_waAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo ) +static HB_ERRCODE hb_waAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo ) { LPFIELD pField; char szFieldName[ HB_SYMBOL_NAME_LEN + 1 ], *szPtr; @@ -253,7 +253,7 @@ static ERRCODE hb_waAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo ) } hb_strncpyUpperTrim( szFieldName, szPtr, sizeof( szFieldName ) - 1 ); if( strlen( szFieldName ) == 0 ) - return FAILURE; + return HB_FAILURE; pField = pArea->lpFields + pArea->uiFieldCount; if( pArea->uiFieldCount > 0 ) @@ -266,16 +266,16 @@ static ERRCODE hb_waAddField( AREAP pArea, LPDBFIELDINFO pFieldInfo ) pField->uiFlags = pFieldInfo->uiFlags; pField->uiArea = pArea->uiArea; pArea->uiFieldCount ++; - return SUCCESS; + return HB_SUCCESS; } /* * Add all fields defined in an array to the WorkArea. */ -static ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) +static HB_ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) { USHORT uiItems, uiCount, uiLen, uiDec; - ERRCODE errCode = SUCCESS; + HB_ERRCODE errCode = HB_SUCCESS; DBFIELDINFO pFieldInfo; PHB_ITEM pFieldDesc; int iData; @@ -283,8 +283,8 @@ static ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) HB_TRACE(HB_TR_DEBUG, ("hb_waCreateFields(%p, %p)", pArea, pStruct)); uiItems = ( USHORT ) hb_arrayLen( pStruct ); - if( SELF_SETFIELDEXTENT( pArea, uiItems ) != SUCCESS ) - return FAILURE; + if( SELF_SETFIELDEXTENT( pArea, uiItems ) != HB_SUCCESS ) + return HB_FAILURE; for( uiCount = 0; uiCount < uiItems; uiCount++ ) { @@ -373,7 +373,7 @@ static ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) if( uiLen > 20 ) */ if( uiLen > 255 ) - errCode = FAILURE; + errCode = HB_FAILURE; break; case 'F': @@ -381,7 +381,7 @@ static ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) pFieldInfo.uiDec = uiDec; /* see note above */ if( uiLen > 255 ) - errCode = FAILURE; + errCode = HB_FAILURE; break; case 'T': @@ -448,44 +448,44 @@ static ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) break; default: - errCode = FAILURE; + errCode = HB_FAILURE; break; } - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); return errCode; } /* Add field */ - else if( SELF_ADDFIELD( pArea, &pFieldInfo ) != SUCCESS ) - return FAILURE; + else if( SELF_ADDFIELD( pArea, &pFieldInfo ) != HB_SUCCESS ) + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Determine the number of fields in the WorkArea. */ -static ERRCODE hb_waFieldCount( AREAP pArea, USHORT * uiFields ) +static HB_ERRCODE hb_waFieldCount( AREAP pArea, USHORT * uiFields ) { HB_TRACE(HB_TR_DEBUG, ("hb_waFieldCount(%p, %p)", pArea, uiFields)); * uiFields = pArea->uiFieldCount; - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve information about a field. */ -static ERRCODE hb_waFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ) +static HB_ERRCODE hb_waFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ) { LPFIELD pField; HB_TRACE(HB_TR_DEBUG, ("hb_waFieldInfo(%p, %hu, %hu, %p)", pArea, uiIndex, uiType, pItem)); if( uiIndex > pArea->uiFieldCount ) - return FAILURE; + return HB_FAILURE; pField = pArea->lpFields + uiIndex - 1; switch( uiType ) @@ -598,34 +598,34 @@ static ERRCODE hb_waFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiType, PHB_I #endif default: - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Determine the name associated with a field number. */ -static ERRCODE hb_waFieldName( AREAP pArea, USHORT uiIndex, void * szName ) +static HB_ERRCODE hb_waFieldName( AREAP pArea, USHORT uiIndex, void * szName ) { LPFIELD pField; HB_TRACE(HB_TR_DEBUG, ("hb_waFieldName(%p, %hu, %p)", pArea, uiIndex, szName)); if( uiIndex > pArea->uiFieldExtent ) - return FAILURE; + return HB_FAILURE; pField = pArea->lpFields + uiIndex - 1; hb_strncpy( ( char * ) szName, hb_dynsymName( ( PHB_DYNS ) pField->sym ), pArea->uiMaxFieldNameLength ); - return SUCCESS; + return HB_SUCCESS; } /* * Establish the extent of the array of fields for a WorkArea. */ -static ERRCODE hb_waSetFieldExtent( AREAP pArea, USHORT uiFieldExtent ) +static HB_ERRCODE hb_waSetFieldExtent( AREAP pArea, USHORT uiFieldExtent ) { HB_TRACE(HB_TR_DEBUG, ("hb_waSetFieldExtent(%p, %hu)", pArea, uiFieldExtent)); @@ -638,13 +638,13 @@ static ERRCODE hb_waSetFieldExtent( AREAP pArea, USHORT uiFieldExtent ) memset( pArea->lpFields, 0, uiFieldExtent * sizeof( FIELD ) ); } - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the alias of the WorkArea. */ -static ERRCODE hb_waAlias( AREAP pArea, BYTE * szAlias ) +static HB_ERRCODE hb_waAlias( AREAP pArea, BYTE * szAlias ) { HB_TRACE(HB_TR_DEBUG, ("hb_waAlias(%p, %p)", pArea, szAlias)); @@ -653,13 +653,13 @@ static ERRCODE hb_waAlias( AREAP pArea, BYTE * szAlias ) ? hb_dynsymName( ( PHB_DYNS ) pArea->atomAlias ) : "", HB_RDD_MAX_ALIAS_LEN ); - return SUCCESS; + return HB_SUCCESS; } /* * Close the table in the WorkArea. */ -static ERRCODE hb_waClose( AREAP pArea ) +static HB_ERRCODE hb_waClose( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_waClose(%p)", pArea)); @@ -674,13 +674,13 @@ static ERRCODE hb_waClose( AREAP pArea ) if( pArea->atomAlias ) hb_dynsymSetAreaHandle( ( PHB_DYNS ) pArea->atomAlias, 0 ); - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve information about the current driver. */ -static ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) +static HB_ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) { HB_TRACE(HB_TR_DEBUG, ("hb_waInfo(%p, %hu, %p)", pArea, uiIndex, pItem)); @@ -694,13 +694,13 @@ static ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; /* - * IMHO better to return FAILURE to notice that it's not supported + * IMHO better to return HB_FAILURE to notice that it's not supported */ case DBI_GETDELIMITER: case DBI_SETDELIMITER: case DBI_SEPARATOR: hb_itemPutC( pItem, NULL ); - return FAILURE; + return HB_FAILURE; case DBI_GETHEADERSIZE: case DBI_GETRECSIZE: @@ -755,9 +755,9 @@ static ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) case DBI_ALIAS: { char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ]; - if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) != SUCCESS ) + if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) != HB_SUCCESS ) { - return FAILURE; + return HB_FAILURE; } hb_itemPutC( pItem, szAlias ); break; @@ -791,12 +791,12 @@ static ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) case DBI_POSITIONED: { ULONG ulRecCount, ulRecNo; - if( SELF_RECNO( pArea, &ulRecNo ) != SUCCESS ) - return FAILURE; + if( SELF_RECNO( pArea, &ulRecNo ) != HB_SUCCESS ) + return HB_FAILURE; if( ulRecNo == 0 ) hb_itemPutL( pItem, FALSE ); - else if( SELF_RECCOUNT( pArea, &ulRecCount ) != SUCCESS ) - return FAILURE; + else if( SELF_RECCOUNT( pArea, &ulRecCount ) != HB_SUCCESS ) + return HB_FAILURE; else hb_itemPutL( pItem, ulRecNo != ulRecCount + 1 ); break; @@ -814,16 +814,16 @@ static ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; default: - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve information about the current order that SELF could not. * Called by SELF_ORDINFO if uiIndex is not supported. */ -static ERRCODE hb_waOrderInfo( AREAP pArea, USHORT index, LPDBORDERINFO pInfo ) +static HB_ERRCODE hb_waOrderInfo( AREAP pArea, USHORT index, LPDBORDERINFO pInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_waOrderInfo(%p, %hu, %p)", pArea, index, pInfo)); @@ -838,13 +838,13 @@ static ERRCODE hb_waOrderInfo( AREAP pArea, USHORT index, LPDBORDERINFO pInfo ) */ /* hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); */ - return FAILURE; + return HB_FAILURE; } /* * Clear the WorkArea for use. */ -static ERRCODE hb_waNewArea( AREAP pArea ) +static HB_ERRCODE hb_waNewArea( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_waNewArea(%p)", pArea)); @@ -853,14 +853,14 @@ static ERRCODE hb_waNewArea( AREAP pArea ) pArea->uiParents = 0; pArea->uiMaxFieldNameLength = 10; - return SUCCESS; + return HB_SUCCESS; } /* * Open a data store in the WorkArea. * Like in Clipper it's also mapped as Create() method at WA level */ -static ERRCODE hb_waOpen( AREAP pArea, LPDBOPENINFO pInfo ) +static HB_ERRCODE hb_waOpen( AREAP pArea, LPDBOPENINFO pInfo ) { if( !pArea->atomAlias && pInfo->atomAlias && pInfo->atomAlias[ 0 ] ) { @@ -869,13 +869,13 @@ static ERRCODE hb_waOpen( AREAP pArea, LPDBOPENINFO pInfo ) if( ! pArea->atomAlias ) { SELF_CLOSE( ( AREAP ) pArea ); - return FAILURE; + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } -static ERRCODE hb_waOrderCondition( AREAP pArea, LPDBORDERCONDINFO param ) +static HB_ERRCODE hb_waOrderCondition( AREAP pArea, LPDBORDERCONDINFO param ) { if( pArea->lpdbOrdCondInfo ) { @@ -907,13 +907,13 @@ static ERRCODE hb_waOrderCondition( AREAP pArea, LPDBORDERCONDINFO param ) } pArea->lpdbOrdCondInfo = param; - return SUCCESS; + return HB_SUCCESS; } /* * Release all references to a WorkArea. */ -static ERRCODE hb_waRelease( AREAP pArea ) +static HB_ERRCODE hb_waRelease( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_waRelease(%p)", pArea)); @@ -926,38 +926,38 @@ static ERRCODE hb_waRelease( AREAP pArea ) /* intentionally direct call not a method */ hb_waOrderCondition( pArea,NULL ); hb_xfree( pArea ); - return SUCCESS; + return HB_SUCCESS; } /* * Retrieve the size of the WorkArea structure. */ -static ERRCODE hb_waStructSize( AREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_waStructSize( AREAP pArea, USHORT * uiSize ) { HB_TRACE(HB_TR_DEBUG, ("hb_waStrucSize(%p, %p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( AREA ); - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the name of replaceable database driver (RDD) subsystem. */ -static ERRCODE hb_waSysName( AREAP pArea, BYTE * pBuffer ) +static HB_ERRCODE hb_waSysName( AREAP pArea, BYTE * pBuffer ) { HB_TRACE(HB_TR_DEBUG, ("hb_waSysName(%p, %p)", pArea, pBuffer)); hb_strncpy( ( char * ) pBuffer, SELF_RDDNODE( pArea )->szName, HB_RDD_MAX_DRIVERNAME_LEN ); - return SUCCESS; + return HB_SUCCESS; } /* * Evaluate code block for each record in WorkArea. */ -static ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) +static HB_ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) { LONG lNext = 1; BOOL fEof, fFor; @@ -966,8 +966,8 @@ static ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) if( pEvalInfo->dbsci.itmRecID ) { - if( SELF_GOTOID( pArea, pEvalInfo->dbsci.itmRecID ) != SUCCESS ) - return FAILURE; + if( SELF_GOTOID( pArea, pEvalInfo->dbsci.itmRecID ) != HB_SUCCESS ) + return HB_FAILURE; } else if( pEvalInfo->dbsci.lNext ) { @@ -976,8 +976,8 @@ static ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) else if( !pEvalInfo->dbsci.itmCobWhile && !hb_itemGetL( pEvalInfo->dbsci.fRest ) ) { - if( SELF_GOTOP( pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOTOP( pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* TODO: use SKIPSCOPE() method and fRest parameter */ @@ -986,24 +986,24 @@ static ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) { for( ;; ) { - if( SELF_EOF( pArea, &fEof ) != SUCCESS ) - return FAILURE; + if( SELF_EOF( pArea, &fEof ) != HB_SUCCESS ) + return HB_FAILURE; if( fEof ) break; if( pEvalInfo->dbsci.itmCobWhile ) { - if( SELF_EVALBLOCK( pArea, pEvalInfo->dbsci.itmCobWhile ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pEvalInfo->dbsci.itmCobWhile ) != HB_SUCCESS ) + return HB_FAILURE; if( ! hb_itemGetL( pArea->valResult ) ) break; } if( pEvalInfo->dbsci.itmCobFor ) { - if( SELF_EVALBLOCK( pArea, pEvalInfo->dbsci.itmCobFor ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pEvalInfo->dbsci.itmCobFor ) != HB_SUCCESS ) + return HB_FAILURE; fFor = hb_itemGetL( pArea->valResult ); } else @@ -1011,25 +1011,25 @@ static ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) if( fFor ) { - if( SELF_EVALBLOCK( pArea, pEvalInfo->itmBlock ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pEvalInfo->itmBlock ) != HB_SUCCESS ) + return HB_FAILURE; } if( pEvalInfo->dbsci.itmRecID || ( pEvalInfo->dbsci.lNext && --lNext < 1 ) ) break; - if( SELF_SKIP( pArea, 1 ) != SUCCESS ) - return FAILURE; + if( SELF_SKIP( pArea, 1 ) != HB_SUCCESS ) + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Locate a record which pass given condition */ -static ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue ) +static HB_ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue ) { LONG lNext = 1; BOOL fEof; @@ -1039,15 +1039,15 @@ static ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue ) if( fContinue ) { if( ! pArea->dbsi.itmCobFor ) - return SUCCESS; + return HB_SUCCESS; - if( SELF_SKIP( pArea, 1 ) != SUCCESS ) - return FAILURE; + if( SELF_SKIP( pArea, 1 ) != HB_SUCCESS ) + return HB_FAILURE; } else if( pArea->dbsi.itmRecID ) { - if( SELF_GOTOID( pArea, pArea->dbsi.itmRecID ) != SUCCESS ) - return FAILURE; + if( SELF_GOTOID( pArea, pArea->dbsi.itmRecID ) != HB_SUCCESS ) + return HB_FAILURE; } else if( pArea->dbsi.lNext ) { @@ -1056,8 +1056,8 @@ static ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue ) else if( !pArea->dbsi.itmCobWhile && !hb_itemGetL( pArea->dbsi.fRest ) ) { - if( SELF_GOTOP( pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOTOP( pArea ) != HB_SUCCESS ) + return HB_FAILURE; } pArea->fFound = FALSE; @@ -1068,16 +1068,16 @@ static ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue ) { for( ;; ) { - if( SELF_EOF( pArea, &fEof ) != SUCCESS ) - return FAILURE; + if( SELF_EOF( pArea, &fEof ) != HB_SUCCESS ) + return HB_FAILURE; if( fEof ) break; if( !fContinue && pArea->dbsi.itmCobWhile ) { - if( SELF_EVALBLOCK( pArea, pArea->dbsi.itmCobWhile ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pArea->dbsi.itmCobWhile ) != HB_SUCCESS ) + return HB_FAILURE; if( ! hb_itemGetL( pArea->valResult ) ) break; } @@ -1089,8 +1089,8 @@ static ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue ) } else { - if( SELF_EVALBLOCK( pArea, pArea->dbsi.itmCobFor ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pArea->dbsi.itmCobFor ) != HB_SUCCESS ) + return HB_FAILURE; if( hb_itemGetL( pArea->valResult ) ) { @@ -1103,18 +1103,18 @@ static ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue ) ( pArea->dbsi.itmRecID || ( pArea->dbsi.lNext && --lNext < 1 ) ) ) break; - if( SELF_SKIP( pArea, 1 ) != SUCCESS ) - return FAILURE; + if( SELF_SKIP( pArea, 1 ) != HB_SUCCESS ) + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Copy one or more records from one WorkArea to another. */ -static ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) +static HB_ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) { LONG lNext = 1; BOOL fEof, fFor; @@ -1123,8 +1123,8 @@ static ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) if( pTransInfo->dbsci.itmRecID ) { - if( SELF_GOTOID( pArea, pTransInfo->dbsci.itmRecID ) != SUCCESS ) - return FAILURE; + if( SELF_GOTOID( pArea, pTransInfo->dbsci.itmRecID ) != HB_SUCCESS ) + return HB_FAILURE; } else if( pTransInfo->dbsci.lNext ) { @@ -1133,8 +1133,8 @@ static ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) else if( !pTransInfo->dbsci.itmCobWhile && !hb_itemGetL( pTransInfo->dbsci.fRest ) ) { - if( SELF_GOTOP( pArea ) != SUCCESS ) - return FAILURE; + if( SELF_GOTOP( pArea ) != HB_SUCCESS ) + return HB_FAILURE; } /* TODO: use SKIPSCOPE() method and fRest parameter */ @@ -1143,24 +1143,24 @@ static ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) { for( ;; ) { - if( SELF_EOF( pArea, &fEof ) != SUCCESS ) - return FAILURE; + if( SELF_EOF( pArea, &fEof ) != HB_SUCCESS ) + return HB_FAILURE; if( fEof ) break; if( pTransInfo->dbsci.itmCobWhile ) { - if( SELF_EVALBLOCK( pArea, pTransInfo->dbsci.itmCobWhile ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pTransInfo->dbsci.itmCobWhile ) != HB_SUCCESS ) + return HB_FAILURE; if( ! hb_itemGetL( pArea->valResult ) ) break; } if( pTransInfo->dbsci.itmCobFor ) { - if( SELF_EVALBLOCK( pArea, pTransInfo->dbsci.itmCobFor ) != SUCCESS ) - return FAILURE; + if( SELF_EVALBLOCK( pArea, pTransInfo->dbsci.itmCobFor ) != HB_SUCCESS ) + return HB_FAILURE; fFor = hb_itemGetL( pArea->valResult ); } else @@ -1168,46 +1168,46 @@ static ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) if( fFor ) { - if( SELF_TRANSREC( pArea, pTransInfo ) != SUCCESS ) - return FAILURE; + if( SELF_TRANSREC( pArea, pTransInfo ) != HB_SUCCESS ) + return HB_FAILURE; } if( pTransInfo->dbsci.itmRecID || ( pTransInfo->dbsci.lNext && --lNext < 1 ) ) break; - if( SELF_SKIP( pArea, 1 ) != SUCCESS ) - return FAILURE; + if( SELF_SKIP( pArea, 1 ) != HB_SUCCESS ) + return HB_FAILURE; } } - return SUCCESS; + return HB_SUCCESS; } /* * Copy a record to another WorkArea. */ -static ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) +static HB_ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) { BOOL bDeleted; BYTE *pRecord; - ERRCODE errCode; + HB_ERRCODE errCode; HB_TRACE(HB_TR_DEBUG, ("hb_waTransRec(%p, %p)", pArea, pTransInfo)); /* Record deleted? */ errCode = SELF_DELETED( ( AREAP ) pArea, &bDeleted ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; if( pTransInfo->uiFlags & DBTF_MATCH && pTransInfo->uiFlags & DBTF_PUTREC ) { errCode = SELF_GETREC( ( AREAP ) pArea, &pRecord ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; /* Append a new record */ errCode = SELF_APPEND( ( AREAP ) pTransInfo->lpaDest, TRUE ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; /* Copy record */ @@ -1221,7 +1221,7 @@ static ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) /* Append a new record */ errCode = SELF_APPEND( ( AREAP ) pTransInfo->lpaDest, TRUE ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) return errCode; pItem = hb_itemNew( NULL ); @@ -1230,11 +1230,11 @@ static ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) { errCode = SELF_GETVALUE( ( AREAP ) pArea, pTransItem->uiSource, pItem ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; errCode = SELF_PUTVALUE( ( AREAP ) pTransInfo->lpaDest, pTransItem->uiDest, pItem ); - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) break; ++pTransItem; } @@ -1242,7 +1242,7 @@ static ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) } /* Delete the new record if copy fail */ - if( errCode != SUCCESS ) + if( errCode != HB_SUCCESS ) { SELF_DELETE( ( AREAP ) pTransInfo->lpaDest ); return errCode; @@ -1252,13 +1252,13 @@ static ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo ) if( bDeleted ) return SELF_DELETE( ( AREAP ) pTransInfo->lpaDest ); - return SUCCESS; + return HB_SUCCESS; } /* * Report end of relation. */ -static ERRCODE hb_waChildEnd( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_waChildEnd( AREAP pArea, LPDBRELINFO pRelInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_waChildEnd(%p, %p)", pArea, pRelInfo)); @@ -1275,25 +1275,25 @@ static ERRCODE hb_waChildEnd( AREAP pArea, LPDBRELINFO pRelInfo ) } pArea->uiParents--; - return SUCCESS; + return HB_SUCCESS; } /* * Report initialization of a relation. */ -static ERRCODE hb_waChildStart( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_waChildStart( AREAP pArea, LPDBRELINFO pRelInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_waChildStart(%p, %p)", pArea, pRelInfo)); HB_SYMBOL_UNUSED( pRelInfo ); pArea->uiParents ++; - return SUCCESS; + return HB_SUCCESS; } /* * Force relational movement in child WorkAreas. */ -static ERRCODE hb_waSyncChildren( AREAP pArea ) +static HB_ERRCODE hb_waSyncChildren( AREAP pArea ) { LPDBRELINFO lpdbRelation; @@ -1302,18 +1302,18 @@ static ERRCODE hb_waSyncChildren( AREAP pArea ) lpdbRelation = pArea->lpdbRelations; while( lpdbRelation ) { - if( SELF_CHILDSYNC( lpdbRelation->lpaChild, lpdbRelation ) != SUCCESS ) - return FAILURE; + if( SELF_CHILDSYNC( lpdbRelation->lpaChild, lpdbRelation ) != HB_SUCCESS ) + return HB_FAILURE; lpdbRelation = lpdbRelation->lpdbriNext; } - return SUCCESS; + return HB_SUCCESS; } /* * Clear all relations in the specified WorkArea. */ -static ERRCODE hb_waClearRel( AREAP pArea ) +static HB_ERRCODE hb_waClearRel( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_waClearRel(%p)", pArea )); @@ -1345,13 +1345,13 @@ static ERRCODE hb_waClearRel( AREAP pArea ) hb_rddSelectWorkAreaNumber( iCurrArea ); } - return SUCCESS; + return HB_SUCCESS; } /* * Obtain the workarea number of the specified relation. */ -static ERRCODE hb_waRelArea( AREAP pArea, USHORT uiRelNo, void * pRelArea ) +static HB_ERRCODE hb_waRelArea( AREAP pArea, USHORT uiRelNo, void * pRelArea ) { LPDBRELINFO lpdbRelations; USHORT uiIndex = 1; @@ -1371,24 +1371,24 @@ static ERRCODE hb_waRelArea( AREAP pArea, USHORT uiRelNo, void * pRelArea ) } lpdbRelations = lpdbRelations->lpdbriNext; } - return *pWA ? SUCCESS : FAILURE; + return *pWA ? HB_SUCCESS : HB_FAILURE; } /* * Evaluate a block against the relation in specified WorkArea. */ -static ERRCODE hb_waRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) +static HB_ERRCODE hb_waRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) { PHB_ITEM pResult; DBORDERINFO pInfo; - ERRCODE errCode; + HB_ERRCODE errCode; int iOrder; HB_TRACE(HB_TR_DEBUG, ("hb_waRelEval(%p, %p)", pArea, pRelInfo)); errCode = SELF_EVALBLOCK( pRelInfo->lpaParent, pRelInfo->itmCobExpr ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { /* * Check the current order @@ -1399,7 +1399,7 @@ static ERRCODE hb_waRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) pInfo.itmResult = hb_itemPutNI( NULL, 0 ); errCode = SELF_ORDINFO( pArea, DBOI_NUMBER, &pInfo ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) { iOrder = hb_itemGetNI( pInfo.itmResult ); if( iOrder != 0 ) @@ -1408,10 +1408,10 @@ static ERRCODE hb_waRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) { pInfo.itmNewVal = pResult; errCode = SELF_ORDINFO( pArea, DBOI_SCOPETOP, &pInfo ); - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_ORDINFO( pArea, DBOI_SCOPEBOTTOM, &pInfo ); } - if( errCode == SUCCESS ) + if( errCode == HB_SUCCESS ) errCode = SELF_SEEK( pArea, FALSE, pResult, FALSE ); } else @@ -1440,7 +1440,7 @@ static ERRCODE hb_waRelEval( AREAP pArea, LPDBRELINFO pRelInfo ) /* * Obtain the character expression of the specified relation. */ -static ERRCODE hb_waRelText( AREAP pArea, USHORT uiRelNo, PHB_ITEM pExpr ) +static HB_ERRCODE hb_waRelText( AREAP pArea, USHORT uiRelNo, PHB_ITEM pExpr ) { LPDBRELINFO lpdbRelations; USHORT uiIndex = 1; @@ -1454,18 +1454,18 @@ static ERRCODE hb_waRelText( AREAP pArea, USHORT uiRelNo, PHB_ITEM pExpr ) if( uiIndex++ == uiRelNo ) { hb_itemCopy( pExpr, lpdbRelations->abKey ); - return SUCCESS; + return HB_SUCCESS; } lpdbRelations = lpdbRelations->lpdbriNext; } - return FAILURE; + return HB_FAILURE; } /* * Set a relation in the parent file. */ -static ERRCODE hb_waSetRel( AREAP pArea, LPDBRELINFO lpdbRelInf ) +static HB_ERRCODE hb_waSetRel( AREAP pArea, LPDBRELINFO lpdbRelInf ) { LPDBRELINFO lpdbRelations; @@ -1498,7 +1498,7 @@ static ERRCODE hb_waSetRel( AREAP pArea, LPDBRELINFO lpdbRelInf ) /* * Clear the active filter expression. */ -static ERRCODE hb_waClearFilter( AREAP pArea ) +static HB_ERRCODE hb_waClearFilter( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_waClearFilter(%p)", pArea)); @@ -1516,13 +1516,13 @@ static ERRCODE hb_waClearFilter( AREAP pArea ) pArea->dbfi.fOptimized = FALSE; pArea->dbfi.fFilter = FALSE; - return SUCCESS; + return HB_SUCCESS; } /* * Clear the active locate expression. */ -static ERRCODE hb_waClearLocate( AREAP pArea ) +static HB_ERRCODE hb_waClearLocate( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_waClearLocate(%p)", pArea)); @@ -1563,32 +1563,32 @@ static ERRCODE hb_waClearLocate( AREAP pArea ) pArea->dbsi.fRest = NULL; } - return SUCCESS; + return HB_SUCCESS; } /* * Return filter condition of the specified WorkArea. */ -static ERRCODE hb_waFilterText( AREAP pArea, PHB_ITEM pFilter ) +static HB_ERRCODE hb_waFilterText( AREAP pArea, PHB_ITEM pFilter ) { HB_TRACE(HB_TR_DEBUG, ("hb_waFilterText(%p, %p)", pArea, pFilter)); if( pArea->dbfi.abFilterText ) hb_itemCopy( pFilter, pArea->dbfi.abFilterText ); - return SUCCESS; + return HB_SUCCESS; } /* * Set the filter condition for the specified WorkArea. */ -static ERRCODE hb_waSetFilter( AREAP pArea, LPDBFILTERINFO pFilterInfo ) +static HB_ERRCODE hb_waSetFilter( AREAP pArea, LPDBFILTERINFO pFilterInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_waSetFilter(%p, %p)", pArea, pFilterInfo)); /* Clear the active filter expression */ - if( SELF_CLEARFILTER( pArea ) != SUCCESS ) - return FAILURE; + if( SELF_CLEARFILTER( pArea ) != HB_SUCCESS ) + return HB_FAILURE; if( pFilterInfo->itmCobExpr ) { @@ -1601,19 +1601,19 @@ static ERRCODE hb_waSetFilter( AREAP pArea, LPDBFILTERINFO pFilterInfo ) pArea->dbfi.fOptimized = pFilterInfo->fOptimized; pArea->dbfi.fFilter = TRUE; - return SUCCESS; + return HB_SUCCESS; } /* * Set the locate scope for the specified WorkArea. */ -static ERRCODE hb_waSetLocate( AREAP pArea, LPDBSCOPEINFO pScopeInfo ) +static HB_ERRCODE hb_waSetLocate( AREAP pArea, LPDBSCOPEINFO pScopeInfo ) { HB_TRACE(HB_TR_DEBUG, ("hb_waSetLocate(%p, %p)", pArea, pScopeInfo)); /* Clear the active locate expression */ - if( SELF_CLEARLOCATE( pArea ) != SUCCESS ) - return FAILURE; + if( SELF_CLEARLOCATE( pArea ) != HB_SUCCESS ) + return HB_FAILURE; if( pScopeInfo->itmCobFor ) pArea->dbsi.itmCobFor = hb_itemNew( pScopeInfo->itmCobFor ); @@ -1643,13 +1643,13 @@ static ERRCODE hb_waSetLocate( AREAP pArea, LPDBSCOPEINFO pScopeInfo ) pArea->dbsi.fBackward = pScopeInfo->fBackward; pArea->dbsi.fOptimized = pScopeInfo->fOptimized; - return SUCCESS; + return HB_SUCCESS; } /* * Compile a character expression. */ -static ERRCODE hb_waCompile( AREAP pArea, BYTE * pExpr ) +static HB_ERRCODE hb_waCompile( AREAP pArea, BYTE * pExpr ) { HB_MACRO_PTR pMacro; @@ -1659,16 +1659,16 @@ static ERRCODE hb_waCompile( AREAP pArea, BYTE * pExpr ) if( pMacro ) { pArea->valResult = hb_itemPutPtr( pArea->valResult, ( void * ) pMacro ); - return SUCCESS; + return HB_SUCCESS; } else - return FAILURE; + return HB_FAILURE; } /* * Raise a runtime error. */ -static ERRCODE hb_waError( AREAP pArea, PHB_ITEM pError ) +static HB_ERRCODE hb_waError( AREAP pArea, PHB_ITEM pError ) { char * szRddName; @@ -1688,7 +1688,7 @@ static ERRCODE hb_waError( AREAP pArea, PHB_ITEM pError ) /* * Evaluate a code block. */ -static ERRCODE hb_waEvalBlock( AREAP pArea, PHB_ITEM pBlock ) +static HB_ERRCODE hb_waEvalBlock( AREAP pArea, PHB_ITEM pBlock ) { PHB_ITEM pItem; int iCurrArea; @@ -1706,13 +1706,13 @@ static ERRCODE hb_waEvalBlock( AREAP pArea, PHB_ITEM pBlock ) hb_rddSelectWorkAreaNumber( iCurrArea ); - return hb_vmRequestQuery() ? FAILURE : SUCCESS; + return hb_vmRequestQuery() ? HB_FAILURE : HB_SUCCESS; } /* * RDD info */ -static ERRCODE hb_waRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnection, PHB_ITEM pItem ) +static HB_ERRCODE hb_waRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnection, PHB_ITEM pItem ) { BOOL fResult; int iResult; @@ -1814,7 +1814,7 @@ static ERRCODE hb_waRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnection, hb_itemPutCLPtr( pItem, szResult, strlen( szResult ) ); break; } - /* no break - return FAILURE */ + /* no break - return HB_FAILURE */ } case RDDI_TABLEEXT: case RDDI_ORDBAGEXT: @@ -1825,18 +1825,18 @@ static ERRCODE hb_waRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnection, case RDDI_TRIGGER: case RDDI_PENDINGTRIGGER: hb_itemPutC( pItem, NULL ); - /* no break - return FAILURE */ + /* no break - return HB_FAILURE */ default: - return FAILURE; + return HB_FAILURE; } - return SUCCESS; + return HB_SUCCESS; } /* * Raise a runtime error if an method is not defined. */ -static ERRCODE hb_waUnsupported( AREAP pArea ) +static HB_ERRCODE hb_waUnsupported( AREAP pArea ) { PHB_ITEM pError; @@ -1848,13 +1848,13 @@ static ERRCODE hb_waUnsupported( AREAP pArea ) SELF_ERROR( pArea, pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } /* * Raise a runtime error if an method is not defined. */ -static ERRCODE hb_waRddUnsupported( LPRDDNODE pRDD ) +static HB_ERRCODE hb_waRddUnsupported( LPRDDNODE pRDD ) { PHB_ITEM pError; @@ -1869,20 +1869,20 @@ static ERRCODE hb_waRddUnsupported( LPRDDNODE pRDD ) hb_errLaunch( pError ); hb_itemRelease( pError ); - return FAILURE; + return HB_FAILURE; } #if 0 /* * Empty method. */ -static ERRCODE hb_waNull( AREAP pArea ) +static HB_ERRCODE hb_waNull( AREAP pArea ) { HB_TRACE(HB_TR_DEBUG, ("hb_waNull(%p)", pArea)); HB_SYMBOL_UNUSED( pArea ); - return SUCCESS; + return HB_SUCCESS; } #endif @@ -2146,7 +2146,7 @@ int hb_rddRegister( const char * szDriver, USHORT uiType ) hb_vmPushPointer( ( void * ) &pRddNewNode->pSuperTable ); hb_vmPushInteger( s_uiRddCount ); hb_vmDo( 4 ); - if( hb_parni( -1 ) != SUCCESS ) + if( hb_parni( -1 ) != HB_SUCCESS ) iResult = 3; /* Invalid FUNCTABLE */ else { @@ -2185,7 +2185,7 @@ int hb_rddRegister( const char * szDriver, USHORT uiType ) * pSuperTable - a current table in a RDDNODE * szDrvName - a driver name that will be inherited */ -ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * pSuperTable, const char * szDrvName ) +HB_ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * pSuperTable, const char * szDrvName ) { LPRDDNODE pRddNode; USHORT uiCount; @@ -2195,7 +2195,7 @@ ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * if( !pTable ) { - return FAILURE; + return HB_FAILURE; } /* Copy the pSuperTable into pTable */ @@ -2213,7 +2213,7 @@ ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * if( !pRddNode ) { - return FAILURE; + return HB_FAILURE; } memcpy( pTable, &pRddNode->pTable, sizeof( RDDFUNCS ) ); @@ -2230,7 +2230,7 @@ ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * pFunction ++; pSubFunction ++; } - return SUCCESS; + return HB_SUCCESS; } /* extend the size of RDD nodes buffer to given value to avoid later