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

2009-02-03 15:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* 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
This commit is contained in:
Viktor Szakats
2009-02-03 14:29:35 +00:00
parent b438524f5e
commit 185f03cbfd
29 changed files with 2199 additions and 2168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
harbour/ChangeLog
View File

@@ -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

142
harbour/include/hbapirdd.h
View File

@@ -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

74
harbour/source/rdd/dbcmd.c
View File

@@ -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 "<aliasNum>" 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;

10
harbour/source/rdd/dbcmd53.c
View File

@@ -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 );

22
harbour/source/rdd/dbcmdx.c
View File

@@ -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;

2
harbour/source/rdd/dbdetach.c
View File

@@ -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 );
}

802
harbour/source/rdd/dbf1.c
View File

File diff suppressed because it is too large Load Diff

384
harbour/source/rdd/dbfcdx/dbfcdx1.c
View File

File diff suppressed because it is too large Load Diff

448
harbour/source/rdd/dbffpt/dbffpt1.c
View File

File diff suppressed because it is too large Load Diff

430
harbour/source/rdd/dbfnsx/dbfnsx1.c
View File

File diff suppressed because it is too large Load Diff

430
harbour/source/rdd/dbfntx/dbfntx1.c
View File

File diff suppressed because it is too large Load Diff

20
harbour/source/rdd/dbsql.c
View File

@@ -4,7 +4,7 @@
/*
* Harbour Project source code:
*
*
*
* Copyright 2007 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
* Copyright 2007 Lorenzo Fiorini <lorenzo.fiorini / at / gmail.com>
@@ -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,

168
harbour/source/rdd/delim1.c
View File

@@ -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 );
}

4
harbour/source/rdd/hbdbsort.c
View File

@@ -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;
}
}

2
harbour/source/rdd/hbsix/sxcrypt.c
View File

@@ -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;
}
}

52
harbour/source/rdd/hbsix/sxord.c
View File

@@ -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 );
}

24
harbour/source/rdd/hbsix/sxtable.c
View File

@@ -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 );
}

38
harbour/source/rdd/hsx/hsx.c
View File

@@ -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 );

32
harbour/source/rdd/nulsys/nulsys.c
View File

@@ -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 ) {}

168
harbour/source/rdd/sdf1.c
View File

@@ -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 );
}

96
harbour/source/rdd/usrrdd/rdds/arrayrdd.prg
View File

@@ -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 )

36
harbour/source/rdd/usrrdd/rdds/fcomma.prg
View File

@@ -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

8
harbour/source/rdd/usrrdd/rdds/hscdx.prg
View File

@@ -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

21
harbour/source/rdd/usrrdd/rdds/logrdd.prg
View File

@@ -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

26
harbour/source/rdd/usrrdd/rdds/rlcdx.prg
View File

@@ -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

299
harbour/source/rdd/usrrdd/usrrdd.c
View File

File diff suppressed because it is too large Load Diff

28
harbour/source/rdd/wacore.c
View File

@@ -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;

176
harbour/source/rdd/wafunc.c
View File

@@ -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));

392
harbour/source/rdd/workarea.c
View File

File diff suppressed because it is too large Load Diff