From 0ce9b5a93c7042feea3da2ff490681b93e361f96 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 2 Oct 2009 00:19:28 +0000 Subject: [PATCH] 2009-10-02 02:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbrdddbf.h * harbour/include/hbrddnsx.h * harbour/include/hbrddcdx.h * harbour/include/hbrddfpt.h * harbour/include/hbrddntx.h * harbour/source/rdd/dbf1.c * harbour/source/rdd/dbffpt/dbffpt1.c * harbour/source/rdd/dbfntx/dbfntx1.c * harbour/source/rdd/dbfnsx/dbfnsx1.c * harbour/source/rdd/dbfcdx/dbfcdx1.c * harbour/contrib/hbbmcdx/hbbmcdx.h * code cleanup --- harbour/ChangeLog | 14 + harbour/contrib/hbbmcdx/hbbmcdx.h | 1 + harbour/include/hbrddcdx.h | 107 +------- harbour/include/hbrdddbf.h | 112 -------- harbour/include/hbrddfpt.h | 108 +------- harbour/include/hbrddnsx.h | 1 + harbour/include/hbrddntx.h | 110 +------- harbour/source/rdd/dbf1.c | 270 +++++++++++-------- harbour/source/rdd/dbfcdx/dbfcdx1.c | 303 +++++++++++---------- harbour/source/rdd/dbffpt/dbffpt1.c | 303 ++++++++++----------- harbour/source/rdd/dbfnsx/dbfnsx1.c | 42 +-- harbour/source/rdd/dbfntx/dbfntx1.c | 403 +++++++++++++++++----------- 12 files changed, 758 insertions(+), 1016 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 40f7405673..a87f71e698 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,20 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-02 02:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbrdddbf.h + * harbour/include/hbrddnsx.h + * harbour/include/hbrddcdx.h + * harbour/include/hbrddfpt.h + * harbour/include/hbrddntx.h + * harbour/source/rdd/dbf1.c + * harbour/source/rdd/dbffpt/dbffpt1.c + * harbour/source/rdd/dbfntx/dbfntx1.c + * harbour/source/rdd/dbfnsx/dbfnsx1.c + * harbour/source/rdd/dbfcdx/dbfcdx1.c + * harbour/contrib/hbbmcdx/hbbmcdx.h + * code cleanup + 2009-10-01 17:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * utils/hbmk2/hbmk2.prg diff --git a/harbour/contrib/hbbmcdx/hbbmcdx.h b/harbour/contrib/hbbmcdx/hbbmcdx.h index ec36555e3b..a763d804bf 100644 --- a/harbour/contrib/hbbmcdx/hbbmcdx.h +++ b/harbour/contrib/hbbmcdx/hbbmcdx.h @@ -501,6 +501,7 @@ typedef BM_FILTER * LPBM_FILTER; * -- DBFCDX METHODS -- */ +#undef SUPERTABLE #define SUPERTABLE ( &cdxSuper ) #define hb_cdxBof NULL diff --git a/harbour/include/hbrddcdx.h b/harbour/include/hbrddcdx.h index 14320e357e..c635d5ff6a 100644 --- a/harbour/include/hbrddcdx.h +++ b/harbour/include/hbrddcdx.h @@ -476,114 +476,9 @@ typedef CDXAREA * LPCDXAREA; #define CDXAREAP LPCDXAREA #endif - -/* - * -- DBFCDX METHODS -- - */ - +#undef SUPERTABLE #define SUPERTABLE ( &cdxSuper ) -#define hb_cdxBof NULL -#define hb_cdxEof NULL -#define hb_cdxFound NULL -static HB_ERRCODE hb_cdxGoBottom( CDXAREAP pArea ); -#define hb_cdxGoTo NULL -#define hb_cdxGoToId NULL -static HB_ERRCODE hb_cdxGoTop( CDXAREAP pArea ); -static HB_ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast ); -static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ); -#define hb_cdxSkipFilter NULL -static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip ); -#define hb_cdxAddField NULL -#define hb_cdxAppend NULL -#define hb_cdxCreateFields NULL -#define hb_cdxDeleteRec NULL -#define hb_cdxDeleted NULL -#define hb_cdxFieldCount NULL -#define hb_cdxFieldDisplay NULL -#define hb_cdxFieldInfo NULL -#define hb_cdxFieldName NULL -static HB_ERRCODE hb_cdxFlush( CDXAREAP pArea ); -#define hb_cdxGetRec NULL -#define hb_cdxGetValue NULL -#define hb_cdxGetVarLen NULL -static HB_ERRCODE hb_cdxGoCold( CDXAREAP pArea ); -static HB_ERRCODE hb_cdxGoHot( CDXAREAP pArea ); -#define hb_cdxPutRec NULL -#define hb_cdxPutValue NULL -#define hb_cdxRecall NULL -#define hb_cdxRecCount NULL -#define hb_cdxRecInfo NULL -#define hb_cdxRecNo NULL -#define hb_cdxRecId NULL -#define hb_cdxSetFieldExtent NULL -#define hb_cdxAlias NULL -static HB_ERRCODE hb_cdxClose( CDXAREAP pArea ); -#define hb_cdxCreate NULL -#define hb_cdxInfo NULL -#define hb_cdxNewArea NULL -static HB_ERRCODE hb_cdxOpen( CDXAREAP pArea, LPDBOPENINFO pOpenInfo ); -#define hb_cdxRelease NULL -static HB_ERRCODE hb_cdxStructSize( CDXAREAP pArea, USHORT * uiSize ); -#define hb_cdxSysName NULL -#define hb_cdxEval NULL -static HB_ERRCODE hb_cdxPack ( CDXAREAP pArea ); -#define hb_cdxPackRec NULL -#define hb_cdxSort NULL -#define hb_cdxTrans NULL -#define hb_cdxTransRec NULL -static HB_ERRCODE hb_cdxZap ( CDXAREAP pArea ); -#define hb_cdxChildEnd NULL -#define hb_cdxChildStart NULL -#define hb_cdxChildSync NULL -#define hb_cdxSyncChildren NULL -#define hb_cdxClearRel NULL -#define hb_cdxForceRel NULL -#define hb_cdxRelArea NULL -#define hb_cdxRelEval NULL -#define hb_cdxRelText NULL -#define hb_cdxSetRel NULL -static HB_ERRCODE hb_cdxOrderListAdd( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE hb_cdxOrderListClear( CDXAREAP pArea ); -static HB_ERRCODE hb_cdxOrderListDelete( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE hb_cdxOrderListFocus( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE hb_cdxOrderListRebuild( CDXAREAP pArea ); -#define hb_cdxOrderCondition NULL -static HB_ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ); -static HB_ERRCODE hb_cdxOrderDestroy( CDXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE hb_cdxClearFilter( CDXAREAP pArea ); -#define hb_cdxClearLocate NULL -#define hb_cdxClearScope NULL -static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ); -#define hb_cdxFilterText NULL -#define hb_cdxScopeInfo NULL -static HB_ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo ); -#define hb_cdxSetLocate NULL -#define hb_cdxSetScope NULL -#define hb_cdxSkipScope NULL -#define hb_cdxLocate NULL -#define hb_cdxCompile NULL -#define hb_cdxError NULL -#define hb_cdxEvalBlock NULL -#define hb_cdxRawLock NULL -#define hb_cdxLock NULL -#define hb_cdxUnLock NULL -#define hb_cdxCloseMemFile NULL -#define hb_cdxCreateMemFile NULL -#define hb_cdxGetValueFile NULL -#define hb_cdxOpenMemFile NULL -#define hb_cdxPutValueFile NULL -#define hb_cdxReadDBHeader NULL -#define hb_cdxWriteDBHeader NULL -#define hb_cdxInit NULL -#define hb_cdxExit NULL -#define hb_cdxDrop NULL -#define hb_cdxExists NULL -#define hb_cdxRename NULL -static HB_ERRCODE hb_cdxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ); -#define hb_cdxWhoCares NULL - HB_EXTERN_END #endif /* HB_RDDCDX_H_ */ diff --git a/harbour/include/hbrdddbf.h b/harbour/include/hbrdddbf.h index 821fbcea44..b43a7e8fb4 100644 --- a/harbour/include/hbrdddbf.h +++ b/harbour/include/hbrdddbf.h @@ -234,120 +234,8 @@ typedef DBFAREA * LPDBFAREA; #define DBFAREAP LPDBFAREA #endif -#ifdef _HB_RDDDBF_INTERNAL_ - -/* - * -- DBF METHODS -- - */ - #define SUPERTABLE ( &dbfSuper ) -static HB_ERRCODE hb_dbfBof( DBFAREAP pArea, BOOL * pBof ); -static HB_ERRCODE hb_dbfEof( DBFAREAP pArea, BOOL * pEof ); -static HB_ERRCODE hb_dbfFound( DBFAREAP pArea, BOOL * pFound ); -static HB_ERRCODE hb_dbfGoBottom( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfGoTo( DBFAREAP pArea, ULONG ulRecNo ); -static HB_ERRCODE hb_dbfGoToId( DBFAREAP pArea, PHB_ITEM pItem ); -static HB_ERRCODE hb_dbfGoTop( DBFAREAP pArea ); -#define hb_dbfSeek NULL -static HB_ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ); -#define hb_dbfSkipFilter NULL -static HB_ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, LONG lToSkip ); -static HB_ERRCODE hb_dbfAddField( DBFAREAP pArea, LPDBFIELDINFO pFieldInfo ); -static HB_ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ); -#define hb_dbfCreateFields NULL -static HB_ERRCODE hb_dbfDeleteRec( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfDeleted( DBFAREAP pArea, BOOL * pDeleted ); -#define hb_dbfFieldCount NULL -#define hb_dbfFieldDisplay NULL -static HB_ERRCODE hb_dbfFieldInfo( DBFAREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ); -#define hb_dbfFieldName NULL -static HB_ERRCODE hb_dbfFlush( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfGetRec( DBFAREAP pArea, BYTE ** pBuffer ); -static HB_ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ); -static HB_ERRCODE hb_dbfGetVarLen( DBFAREAP pArea, USHORT uiIndex, ULONG * pLength ); -static HB_ERRCODE hb_dbfGoCold( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfGoHot( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfPutRec( DBFAREAP pArea, const BYTE * pBuffer ); -static HB_ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ); -static HB_ERRCODE hb_dbfRecall( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfRecCount( DBFAREAP pArea, ULONG * pRecCount ); -static HB_ERRCODE hb_dbfRecInfo( DBFAREAP pArea, PHB_ITEM pRecID, USHORT uiInfoType, PHB_ITEM pInfo ); -static HB_ERRCODE hb_dbfRecNo( DBFAREAP pArea, ULONG * pRecNo ); -static HB_ERRCODE hb_dbfRecId( DBFAREAP pArea, PHB_ITEM pRecNo ); -static HB_ERRCODE hb_dbfSetFieldExtent( DBFAREAP pArea, USHORT uiFieldExtent ); -#define hb_dbfAlias NULL -static HB_ERRCODE hb_dbfClose( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ); -static HB_ERRCODE hb_dbfInfo( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ); -static HB_ERRCODE hb_dbfNewArea( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ); -#define hb_dbfRelease NULL -static HB_ERRCODE hb_dbfStructSize( DBFAREAP pArea, USHORT * uiSize ); -#define hb_dbfSysName NULL -#define hb_dbfEval NULL -static HB_ERRCODE hb_dbfPack( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfPackRec( DBFAREAP pArea, ULONG ulRecNo, BOOL *fWritten ); -static HB_ERRCODE hb_dbfSort( DBFAREAP pArea, LPDBSORTINFO pSortInfo ); -static HB_ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo ); -#define hb_dbfTransRec NULL -static HB_ERRCODE hb_dbfZap( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfChildEnd( DBFAREAP pArea, LPDBRELINFO pRelInfo ); -static HB_ERRCODE hb_dbfChildStart( DBFAREAP pArea, LPDBRELINFO pRelInfo ); -static HB_ERRCODE hb_dbfChildSync( DBFAREAP pArea, LPDBRELINFO pRelInfo ); -#define hb_dbfSyncChildren NULL -#define hb_dbfClearRel NULL -static HB_ERRCODE hb_dbfForceRel( DBFAREAP pArea ); -#define hb_dbfRelArea NULL -#define hb_dbfRelEval NULL -#define hb_dbfRelText NULL -#define hb_dbfSetRel NULL -#define hb_dbfOrderListAdd NULL -#define hb_dbfOrderListClear NULL -#define hb_dbfOrderListDelete NULL -#define hb_dbfOrderListFocus NULL -#define hb_dbfOrderListRebuild NULL -#define hb_dbfOrderCondition NULL -#define hb_dbfOrderCreate NULL -#define hb_dbfOrderDestroy NULL -#define hb_dbfOrderInfo NULL -static HB_ERRCODE hb_dbfClearFilter( DBFAREAP pArea ); -#define hb_dbfClearLocate NULL -#define hb_dbfClearScope NULL -#define hb_dbfCountScope NULL -#define hb_dbfFilterText NULL -#define hb_dbfScopeInfo NULL -static HB_ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo ); -#define hb_dbfSetLocate NULL -#define hb_dbfSetScope NULL -#define hb_dbfSkipScope NULL -#define hb_dbfLocate NULL -#define hb_dbfCompile NULL -#define hb_dbfError NULL -#define hb_dbfEvalBlock NULL -static HB_ERRCODE hb_dbfRawLock( DBFAREAP pArea, USHORT uiAction, ULONG lRecNo ); -static HB_ERRCODE hb_dbfLock( DBFAREAP pArea, LPDBLOCKINFO pLockInfo ); -static HB_ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo ); -#define hb_dbfCloseMemFile NULL -static HB_ERRCODE hb_dbfCreateMemFile( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ); -static HB_ERRCODE hb_dbfGetValueFile( DBFAREAP pArea, USHORT uiIndex, const char * szFile, USHORT uiMode ); -static HB_ERRCODE hb_dbfOpenMemFile( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ); -static HB_ERRCODE hb_dbfPutValueFile( DBFAREAP pArea, USHORT uiIndex, const char * szFile, USHORT uiMode ); - -static HB_ERRCODE hb_dbfReadDBHeader( DBFAREAP pArea ); -static HB_ERRCODE hb_dbfWriteDBHeader( DBFAREAP pArea ); - -static HB_ERRCODE hb_dbfInit( LPRDDNODE pRDD ); -static HB_ERRCODE hb_dbfExit( LPRDDNODE pRDD ); -static HB_ERRCODE hb_dbfDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ); -static HB_ERRCODE hb_dbfExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ); -static HB_ERRCODE hb_dbfRename( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, PHB_ITEM pNewName, ULONG ulConnect ); -static HB_ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ); - -#define hb_dbfWhoCares NULL - -#endif /* _HB_RDDDBF_INTERNAL_ */ - extern HB_EXPORT ULONG hb_dbfGetMemoBlock( DBFAREAP pArea, USHORT uiIndex ); extern HB_EXPORT void hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex, ULONG ulBlock ); diff --git a/harbour/include/hbrddfpt.h b/harbour/include/hbrddfpt.h index 10443d2f28..17ad50e1e7 100644 --- a/harbour/include/hbrddfpt.h +++ b/harbour/include/hbrddfpt.h @@ -244,113 +244,9 @@ typedef FPTAREA * LPFPTAREA; #define FPTAREAP LPFPTAREA #endif -/* - * -- DBFFPT METHODS -- - */ - +#undef SUPERTABLE #define SUPERTABLE ( &fptSuper ) -#define hb_fptBof NULL -#define hb_fptEof NULL -#define hb_fptFound NULL -#define hb_fptGoBottom NULL -#define hb_fptGoTo NULL -#define hb_fptGoToId NULL -#define hb_fptGoTop NULL -#define hb_fptSeek NULL -#define hb_fptSkip NULL -#define hb_fptSkipFilter NULL -#define hb_fptSkipRaw NULL -#define hb_fptAddField NULL -#define hb_fptAppend NULL -#define hb_fptCreateFields NULL -#define hb_fptDeleteRec NULL -#define hb_fptDeleted NULL -#define hb_fptFieldCount NULL -#define hb_fptFieldDisplay NULL -static HB_ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ); -#define hb_fptFieldName NULL -#define hb_fptFlush NULL -#define hb_fptGetRec NULL -static HB_ERRCODE hb_fptGetValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ); -static HB_ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLength ); -#define hb_fptGoCold NULL -#define hb_fptGoHot NULL -#define hb_fptPutRec NULL -static HB_ERRCODE hb_fptPutValue( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ); -#define hb_fptRecall NULL -#define hb_fptRecCount NULL -#define hb_fptRecInfo NULL -#define hb_fptRecNo NULL -#define hb_fptRecId NULL -#define hb_fptSetFieldExtent NULL -#define hb_fptAlias NULL -#define hb_fptClose NULL -#define hb_fptCreate NULL -static HB_ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ); -#define hb_fptNewArea NULL -#define hb_fptOpen NULL -#define hb_fptRelease NULL -static HB_ERRCODE hb_fptStructSize( FPTAREAP pArea, USHORT * uiSize ); -#define hb_fptSysName NULL -#define hb_fptEval NULL -static HB_ERRCODE hb_fptPack( FPTAREAP pArea ); -static HB_ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten ); -#define hb_fptSort NULL -#define hb_fptTrans NULL -#define hb_fptTransRec NULL -#define hb_fptZap NULL -#define hb_fptChildEnd NULL -#define hb_fptChildStart NULL -#define hb_fptChildSync NULL -#define hb_fptSyncChildren NULL -#define hb_fptClearRel NULL -#define hb_fptForceRel NULL -#define hb_fptRelArea NULL -#define hb_fptRelEval NULL -#define hb_fptRelText NULL -#define hb_fptSetRel NULL -#define hb_fptOrderListAdd NULL -#define hb_fptOrderListClear NULL -#define hb_fptOrderListDelete NULL -#define hb_fptOrderListFocus NULL -#define hb_fptOrderListRebuild NULL -#define hb_fptOrderCondition NULL -#define hb_fptOrderCreate NULL -#define hb_fptOrderDestroy NULL -#define hb_fptOrderInfo NULL -#define hb_fptClearFilter NULL -#define hb_fptClearLocate NULL -#define hb_fptClearScope NULL -#define hb_fptCountScope NULL -#define hb_fptFilterText NULL -#define hb_fptScopeInfo NULL -#define hb_fptSetFilter NULL -#define hb_fptSetLocate NULL -#define hb_fptSetScope NULL -#define hb_fptSkipScope NULL -#define hb_fptLocate NULL -#define hb_fptCompile NULL -#define hb_fptError NULL -#define hb_fptEvalBlock NULL -#define hb_fptRawLock NULL -#define hb_fptLock NULL -#define hb_fptUnLock NULL -#define hb_fptCloseMemFile NULL -static HB_ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo ); -static HB_ERRCODE hb_fptGetValueFile( FPTAREAP pArea, USHORT uiIndex, const char * szFile, USHORT uiMode ); -static HB_ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo ); -static HB_ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, const char * szFile, USHORT uiMode ); -#define hb_fptReadDBHeader NULL -#define hb_fptWriteDBHeader NULL -#define hb_fptInit NULL -#define hb_fptExit NULL -#define hb_fptDrop NULL -#define hb_fptExists NULL -#define hb_fptRename NULL -static HB_ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ); -#define hb_fptWhoCares NULL - HB_EXTERN_END -#endif /* HB_RDDFPT */ +#endif /* HB_RDDFPT_H_ */ diff --git a/harbour/include/hbrddnsx.h b/harbour/include/hbrddnsx.h index a3300a8c04..f464f50641 100644 --- a/harbour/include/hbrddnsx.h +++ b/harbour/include/hbrddnsx.h @@ -566,6 +566,7 @@ typedef NSXAREA * LPNSXAREA; #define NSXAREAP LPNSXAREA #endif +#undef SUPERTABLE #define SUPERTABLE ( &nsxSuper ) HB_EXTERN_END diff --git a/harbour/include/hbrddntx.h b/harbour/include/hbrddntx.h index 284e66497a..e0af2e649b 100644 --- a/harbour/include/hbrddntx.h +++ b/harbour/include/hbrddntx.h @@ -363,117 +363,9 @@ typedef NTXAREA * LPNTXAREA; #define NTXAREAP LPNTXAREA #endif - -/* - * -- DBFNTX METHODS -- - */ - +#undef SUPERTABLE #define SUPERTABLE ( &ntxSuper ) -#define ntxBof NULL -#define ntxEof NULL -#define ntxFound NULL -static HB_ERRCODE ntxGoBottom( NTXAREAP pArea ); -#define ntxGoTo NULL -#define ntxGoToId NULL -static HB_ERRCODE ntxGoTop( NTXAREAP pArea ); -static HB_ERRCODE ntxSeek( NTXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast ); -#define ntxSkip NULL -#define ntxSkipFilter NULL -static HB_ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ); -#define ntxAddField NULL -/* static HB_ERRCODE ntxAppend( NTXAREAP pArea, BOOL bUnLockAll ); */ -#define ntxAppend NULL -#define ntxCreateFields NULL -#define ntxDeleteRec NULL -#define ntxDeleted NULL -#define ntxFieldCount NULL -#define ntxFieldDisplay NULL -#define ntxFieldInfo NULL -#define ntxFieldName NULL -static HB_ERRCODE ntxFlush( NTXAREAP pArea ); -#define ntxGetRec NULL -#define ntxGetValue NULL -#define ntxGetVarLen NULL -static HB_ERRCODE ntxGoCold( NTXAREAP pArea ); -static HB_ERRCODE ntxGoHot( NTXAREAP pArea ); -#define ntxPutRec NULL -#define ntxPutValue NULL -#define ntxRecall NULL -#define ntxRecCount NULL -#define ntxRecInfo NULL -#define ntxRecNo NULL -#define ntxRecId NULL -#define ntxSetFieldsExtent NULL -#define ntxAlias NULL -static HB_ERRCODE ntxClose( NTXAREAP pArea ); - /* Close workarea - at first we mus close all indexes and than close - workarea */ -#define ntxCreate NULL -#define ntxInfo NULL -#define ntxNewArea NULL -static HB_ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ); -#define ntxRelease NULL -static HB_ERRCODE ntxStructSize( NTXAREAP pArea, USHORT * uiSize ); -#define ntxSysName NULL -#define ntxEval NULL -static HB_ERRCODE ntxPack( NTXAREAP pArea ); -#define ntPackRec NULL -#define ntxSort NULL -#define ntxTrans NULL -#define ntxTransRec NULL -static HB_ERRCODE ntxZap( NTXAREAP pArea ); -#define ntxchildEnd NULL -#define ntxchildStart NULL -#define ntxchildSync NULL -#define ntxsyncChildren NULL -#define ntxclearRel NULL -#define ntxforceRel NULL -#define ntxrelArea NULL -#define ntxrelEval NULL -#define ntxrelText NULL -#define ntxsetRel NULL -static HB_ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE ntxOrderListClear( NTXAREAP pArea ); -static HB_ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE ntxOrderListRebuild( NTXAREAP pArea ); -#define ntxOrderCondition NULL -static HB_ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ); -static HB_ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ); -static HB_ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ); -#define ntxClearFilter NULL -#define ntxClearLocate NULL -#define ntxClearScope NULL -static HB_ERRCODE ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo ); -#define ntxFilterText NULL -#define ntxScopeInfo NULL -#define ntxSetFilter NULL -#define ntxSetLocate NULL -#define ntxSetScope NULL -#define ntxSkipScope NULL -#define ntxLocate NULL -#define ntxCompile NULL -#define ntxError NULL -#define ntxEvalBlock NULL -#define ntxRawLock NULL -#define ntxLock NULL -#define ntxUnLock NULL -#define ntxCloseMemFile NULL -#define ntxCreateMemFile NULL -#define ntxGetValueFile NULL -#define ntxOpenMemFile NULL -#define ntxPutValueFile NULL -#define ntxReadDBHeader NULL -#define ntxWriteDBHeader NULL -static HB_ERRCODE ntxInit( LPRDDNODE pRDD ); -#define ntxExit NULL -#define ntxDrop NULL -#define ntxExists NULL -#define ntxRename NULL -static HB_ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ); -#define ntxWhoCares NULL - HB_EXTERN_END #endif /* HB_RDDNTX_H_ */ diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 8864239a53..bcdd6d5031 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -52,8 +52,6 @@ #define HB_TRIGVAR_BYREF -#define _HB_RDDDBF_INTERNAL_ - #include "hbrdddbf.h" #include "hbdbsort.h" #include "hbapiitm.h" @@ -73,109 +71,10 @@ # include "hbapicdp.h" #endif + static USHORT s_uiRddId = ( USHORT ) -1; static RDDFUNCS dbfSuper; -static const RDDFUNCS dbfTable = { ( DBENTRYP_BP ) hb_dbfBof, - ( DBENTRYP_BP ) hb_dbfEof, - ( DBENTRYP_BP ) hb_dbfFound, - ( DBENTRYP_V ) hb_dbfGoBottom, - ( DBENTRYP_UL ) hb_dbfGoTo, - ( DBENTRYP_I ) hb_dbfGoToId, - ( DBENTRYP_V ) hb_dbfGoTop, - ( DBENTRYP_BIB ) hb_dbfSeek, - ( DBENTRYP_L ) hb_dbfSkip, - ( DBENTRYP_L ) hb_dbfSkipFilter, - ( DBENTRYP_L ) hb_dbfSkipRaw, - ( DBENTRYP_VF ) hb_dbfAddField, - ( DBENTRYP_B ) hb_dbfAppend, - ( DBENTRYP_I ) hb_dbfCreateFields, - ( DBENTRYP_V ) hb_dbfDeleteRec, - ( DBENTRYP_BP ) hb_dbfDeleted, - ( DBENTRYP_SP ) hb_dbfFieldCount, - ( DBENTRYP_VF ) hb_dbfFieldDisplay, - ( DBENTRYP_SSI ) hb_dbfFieldInfo, - ( DBENTRYP_SCP ) hb_dbfFieldName, - ( DBENTRYP_V ) hb_dbfFlush, - ( DBENTRYP_PP ) hb_dbfGetRec, - ( DBENTRYP_SI ) hb_dbfGetValue, - ( DBENTRYP_SVL ) hb_dbfGetVarLen, - ( DBENTRYP_V ) hb_dbfGoCold, - ( DBENTRYP_V ) hb_dbfGoHot, - ( DBENTRYP_P ) hb_dbfPutRec, - ( DBENTRYP_SI ) hb_dbfPutValue, - ( DBENTRYP_V ) hb_dbfRecall, - ( DBENTRYP_ULP ) hb_dbfRecCount, - ( DBENTRYP_ISI ) hb_dbfRecInfo, - ( DBENTRYP_ULP ) hb_dbfRecNo, - ( DBENTRYP_I ) hb_dbfRecId, - ( DBENTRYP_S ) hb_dbfSetFieldExtent, - ( DBENTRYP_CP ) hb_dbfAlias, - ( DBENTRYP_V ) hb_dbfClose, - ( DBENTRYP_VO ) hb_dbfCreate, - ( DBENTRYP_SI ) hb_dbfInfo, - ( DBENTRYP_V ) hb_dbfNewArea, - ( DBENTRYP_VO ) hb_dbfOpen, - ( DBENTRYP_V ) hb_dbfRelease, - ( DBENTRYP_SP ) hb_dbfStructSize, - ( DBENTRYP_CP ) hb_dbfSysName, - ( DBENTRYP_VEI ) hb_dbfEval, - ( DBENTRYP_V ) hb_dbfPack, - ( DBENTRYP_LSP ) hb_dbfPackRec, - ( DBENTRYP_VS ) hb_dbfSort, - ( DBENTRYP_VT ) hb_dbfTrans, - ( DBENTRYP_VT ) hb_dbfTransRec, - ( DBENTRYP_V ) hb_dbfZap, - ( DBENTRYP_VR ) hb_dbfChildEnd, - ( DBENTRYP_VR ) hb_dbfChildStart, - ( DBENTRYP_VR ) hb_dbfChildSync, - ( DBENTRYP_V ) hb_dbfSyncChildren, - ( DBENTRYP_V ) hb_dbfClearRel, - ( DBENTRYP_V ) hb_dbfForceRel, - ( DBENTRYP_SSP ) hb_dbfRelArea, - ( DBENTRYP_VR ) hb_dbfRelEval, - ( DBENTRYP_SI ) hb_dbfRelText, - ( DBENTRYP_VR ) hb_dbfSetRel, - ( DBENTRYP_VOI ) hb_dbfOrderListAdd, - ( DBENTRYP_V ) hb_dbfOrderListClear, - ( DBENTRYP_VOI ) hb_dbfOrderListDelete, - ( DBENTRYP_VOI ) hb_dbfOrderListFocus, - ( DBENTRYP_V ) hb_dbfOrderListRebuild, - ( DBENTRYP_VOO ) hb_dbfOrderCondition, - ( DBENTRYP_VOC ) hb_dbfOrderCreate, - ( DBENTRYP_VOI ) hb_dbfOrderDestroy, - ( DBENTRYP_SVOI ) hb_dbfOrderInfo, - ( DBENTRYP_V ) hb_dbfClearFilter, - ( DBENTRYP_V ) hb_dbfClearLocate, - ( DBENTRYP_V ) hb_dbfClearScope, - ( DBENTRYP_VPLP ) hb_dbfCountScope, - ( DBENTRYP_I ) hb_dbfFilterText, - ( DBENTRYP_SI ) hb_dbfScopeInfo, - ( DBENTRYP_VFI ) hb_dbfSetFilter, - ( DBENTRYP_VLO ) hb_dbfSetLocate, - ( DBENTRYP_VOS ) hb_dbfSetScope, - ( DBENTRYP_VPL ) hb_dbfSkipScope, - ( DBENTRYP_B ) hb_dbfLocate, - ( DBENTRYP_CC ) hb_dbfCompile, - ( DBENTRYP_I ) hb_dbfError, - ( DBENTRYP_I ) hb_dbfEvalBlock, - ( DBENTRYP_VSP ) hb_dbfRawLock, - ( DBENTRYP_VL ) hb_dbfLock, - ( DBENTRYP_I ) hb_dbfUnLock, - ( DBENTRYP_V ) hb_dbfCloseMemFile, - ( DBENTRYP_VO ) hb_dbfCreateMemFile, - ( DBENTRYP_SCCS ) hb_dbfGetValueFile, - ( DBENTRYP_VO ) hb_dbfOpenMemFile, - ( DBENTRYP_SCCS ) hb_dbfPutValueFile, - ( DBENTRYP_V ) hb_dbfReadDBHeader, - ( DBENTRYP_V ) hb_dbfWriteDBHeader, - ( DBENTRYP_R ) hb_dbfInit, - ( DBENTRYP_R ) hb_dbfExit, - ( DBENTRYP_RVVL ) hb_dbfDrop, - ( DBENTRYP_RVVL ) hb_dbfExists, - ( DBENTRYP_RVVVL ) hb_dbfRename, - ( DBENTRYP_RSLV ) hb_dbfRddInfo, - ( DBENTRYP_SVP ) hb_dbfWhoCares - }; + /* * Common functions. @@ -1547,6 +1446,8 @@ static HB_ERRCODE hb_dbfGoTop( DBFAREAP pArea ) return SELF_SKIPFILTER( ( AREAP ) pArea, 1 ); } +#define hb_dbfSeek NULL + /* * Reposition cursor relative to current position. */ @@ -1589,6 +1490,8 @@ static HB_ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ) return uiError; } +#define hb_dbfSkipFilter NULL + /* * Reposition cursor, regardless of filter. */ @@ -1746,6 +1649,8 @@ static HB_ERRCODE hb_dbfAppend( DBFAREAP pArea, BOOL bUnLockAll ) return HB_SUCCESS; } +#define hb_dbfCreateFields NULL + /* * Delete a record. */ @@ -1802,6 +1707,10 @@ static HB_ERRCODE hb_dbfDeleted( DBFAREAP pArea, BOOL * pDeleted ) return HB_SUCCESS; } +#define hb_dbfFieldCount NULL +#define hb_dbfFieldDisplay NULL +#define hb_dbfFieldName NULL + /* * Write data buffer to the data store. */ @@ -2728,6 +2637,8 @@ static HB_ERRCODE hb_dbfSetFieldExtent( DBFAREAP pArea, USHORT uiFieldExtent ) return HB_SUCCESS; } +#define hb_dbfAlias NULL + /* * Close the table in the WorkArea. */ @@ -4298,6 +4209,8 @@ static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) return errCode; } +#define hb_dbfRelease NULL + /* * Retrieve the size of the WorkArea structure. */ @@ -4310,6 +4223,9 @@ static HB_ERRCODE hb_dbfStructSize( DBFAREAP pArea, USHORT * uiSize ) return HB_SUCCESS; } +#define hb_dbfSysName NULL +#define hb_dbfEval NULL + /* * Pack helper function called for each packed record */ @@ -4662,6 +4578,8 @@ static HB_ERRCODE hb_dbfTrans( DBFAREAP pArea, LPDBTRANSINFO pTransInfo ) return SUPER_TRANS( ( AREAP ) pArea, pTransInfo ); } +#define hb_dbfTransRec NULL + /* * Physically remove all records from data store. */ @@ -4787,6 +4705,9 @@ static HB_ERRCODE hb_dbfChildSync( DBFAREAP pArea, LPDBRELINFO pRelInfo ) return HB_SUCCESS; } +#define hb_dbfSyncChildren NULL +#define hb_dbfClearRel NULL + /* * Force relational seeks in the specified WorkArea. */ @@ -4810,6 +4731,21 @@ static HB_ERRCODE hb_dbfForceRel( DBFAREAP pArea ) return HB_SUCCESS; } +#define hb_dbfRelArea NULL +#define hb_dbfRelEval NULL +#define hb_dbfRelText NULL +#define hb_dbfSetRel NULL + +#define hb_dbfOrderListAdd NULL +#define hb_dbfOrderListClear NULL +#define hb_dbfOrderListDelete NULL +#define hb_dbfOrderListFocus NULL +#define hb_dbfOrderListRebuild NULL +#define hb_dbfOrderCondition NULL +#define hb_dbfOrderCreate NULL +#define hb_dbfOrderDestroy NULL +#define hb_dbfOrderInfo NULL + /* * Clear the filter condition for the specified WorkArea. */ @@ -4823,6 +4759,12 @@ static HB_ERRCODE hb_dbfClearFilter( DBFAREAP pArea ) return SUPER_CLEARFILTER( ( AREAP ) pArea ); } +#define hb_dbfClearLocate NULL +#define hb_dbfClearScope NULL +#define hb_dbfCountScope NULL +#define hb_dbfFilterText NULL +#define hb_dbfScopeInfo NULL + /* * Set the filter condition for the specified WorkArea. */ @@ -4836,6 +4778,15 @@ static HB_ERRCODE hb_dbfSetFilter( DBFAREAP pArea, LPDBFILTERINFO pFilterInfo ) return SUPER_SETFILTER( ( AREAP ) pArea, pFilterInfo ); } +#define hb_dbfSetLocate NULL +#define hb_dbfSetScope NULL +#define hb_dbfSkipScope NULL +#define hb_dbfLocate NULL + +#define hb_dbfCompile NULL +#define hb_dbfError NULL +#define hb_dbfEvalBlock NULL + /* * Perform a network lowlevel lock in the specified WorkArea. */ @@ -4982,18 +4933,15 @@ static HB_ERRCODE hb_dbfLock( DBFAREAP pArea, LPDBLOCKINFO pLockInfo ) */ static HB_ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo ) { - HB_ERRCODE uiError; - ULONG ulRecNo; + HB_ERRCODE uiError = HB_SUCCESS; HB_TRACE(HB_TR_DEBUG, ("dbfUnLock(%p, %p)", pArea, pRecNo)); - ulRecNo = hb_itemGetNL( pRecNo ); - - uiError = HB_SUCCESS; if( pArea->fShared ) { if( pArea->ulNumLocksPos > 0 ) { + ULONG ulRecNo = hb_itemGetNL( pRecNo ); /* Unlock all records? */ if( ulRecNo == 0 ) uiError = hb_dbfUnlockAllRecords( pArea ); @@ -5008,6 +4956,8 @@ static HB_ERRCODE hb_dbfUnLock( DBFAREAP pArea, PHB_ITEM pRecNo ) return uiError; } +#define hb_dbfCloseMemFile NULL + /* * Create a memo file in the WorkArea. */ @@ -5879,6 +5829,110 @@ static HB_ERRCODE hb_dbfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect return HB_SUCCESS; } +#define hb_dbfWhoCares NULL + + +static const RDDFUNCS dbfTable = { ( DBENTRYP_BP ) hb_dbfBof, + ( DBENTRYP_BP ) hb_dbfEof, + ( DBENTRYP_BP ) hb_dbfFound, + ( DBENTRYP_V ) hb_dbfGoBottom, + ( DBENTRYP_UL ) hb_dbfGoTo, + ( DBENTRYP_I ) hb_dbfGoToId, + ( DBENTRYP_V ) hb_dbfGoTop, + ( DBENTRYP_BIB ) hb_dbfSeek, + ( DBENTRYP_L ) hb_dbfSkip, + ( DBENTRYP_L ) hb_dbfSkipFilter, + ( DBENTRYP_L ) hb_dbfSkipRaw, + ( DBENTRYP_VF ) hb_dbfAddField, + ( DBENTRYP_B ) hb_dbfAppend, + ( DBENTRYP_I ) hb_dbfCreateFields, + ( DBENTRYP_V ) hb_dbfDeleteRec, + ( DBENTRYP_BP ) hb_dbfDeleted, + ( DBENTRYP_SP ) hb_dbfFieldCount, + ( DBENTRYP_VF ) hb_dbfFieldDisplay, + ( DBENTRYP_SSI ) hb_dbfFieldInfo, + ( DBENTRYP_SCP ) hb_dbfFieldName, + ( DBENTRYP_V ) hb_dbfFlush, + ( DBENTRYP_PP ) hb_dbfGetRec, + ( DBENTRYP_SI ) hb_dbfGetValue, + ( DBENTRYP_SVL ) hb_dbfGetVarLen, + ( DBENTRYP_V ) hb_dbfGoCold, + ( DBENTRYP_V ) hb_dbfGoHot, + ( DBENTRYP_P ) hb_dbfPutRec, + ( DBENTRYP_SI ) hb_dbfPutValue, + ( DBENTRYP_V ) hb_dbfRecall, + ( DBENTRYP_ULP ) hb_dbfRecCount, + ( DBENTRYP_ISI ) hb_dbfRecInfo, + ( DBENTRYP_ULP ) hb_dbfRecNo, + ( DBENTRYP_I ) hb_dbfRecId, + ( DBENTRYP_S ) hb_dbfSetFieldExtent, + ( DBENTRYP_CP ) hb_dbfAlias, + ( DBENTRYP_V ) hb_dbfClose, + ( DBENTRYP_VO ) hb_dbfCreate, + ( DBENTRYP_SI ) hb_dbfInfo, + ( DBENTRYP_V ) hb_dbfNewArea, + ( DBENTRYP_VO ) hb_dbfOpen, + ( DBENTRYP_V ) hb_dbfRelease, + ( DBENTRYP_SP ) hb_dbfStructSize, + ( DBENTRYP_CP ) hb_dbfSysName, + ( DBENTRYP_VEI ) hb_dbfEval, + ( DBENTRYP_V ) hb_dbfPack, + ( DBENTRYP_LSP ) hb_dbfPackRec, + ( DBENTRYP_VS ) hb_dbfSort, + ( DBENTRYP_VT ) hb_dbfTrans, + ( DBENTRYP_VT ) hb_dbfTransRec, + ( DBENTRYP_V ) hb_dbfZap, + ( DBENTRYP_VR ) hb_dbfChildEnd, + ( DBENTRYP_VR ) hb_dbfChildStart, + ( DBENTRYP_VR ) hb_dbfChildSync, + ( DBENTRYP_V ) hb_dbfSyncChildren, + ( DBENTRYP_V ) hb_dbfClearRel, + ( DBENTRYP_V ) hb_dbfForceRel, + ( DBENTRYP_SSP ) hb_dbfRelArea, + ( DBENTRYP_VR ) hb_dbfRelEval, + ( DBENTRYP_SI ) hb_dbfRelText, + ( DBENTRYP_VR ) hb_dbfSetRel, + ( DBENTRYP_VOI ) hb_dbfOrderListAdd, + ( DBENTRYP_V ) hb_dbfOrderListClear, + ( DBENTRYP_VOI ) hb_dbfOrderListDelete, + ( DBENTRYP_VOI ) hb_dbfOrderListFocus, + ( DBENTRYP_V ) hb_dbfOrderListRebuild, + ( DBENTRYP_VOO ) hb_dbfOrderCondition, + ( DBENTRYP_VOC ) hb_dbfOrderCreate, + ( DBENTRYP_VOI ) hb_dbfOrderDestroy, + ( DBENTRYP_SVOI ) hb_dbfOrderInfo, + ( DBENTRYP_V ) hb_dbfClearFilter, + ( DBENTRYP_V ) hb_dbfClearLocate, + ( DBENTRYP_V ) hb_dbfClearScope, + ( DBENTRYP_VPLP ) hb_dbfCountScope, + ( DBENTRYP_I ) hb_dbfFilterText, + ( DBENTRYP_SI ) hb_dbfScopeInfo, + ( DBENTRYP_VFI ) hb_dbfSetFilter, + ( DBENTRYP_VLO ) hb_dbfSetLocate, + ( DBENTRYP_VOS ) hb_dbfSetScope, + ( DBENTRYP_VPL ) hb_dbfSkipScope, + ( DBENTRYP_B ) hb_dbfLocate, + ( DBENTRYP_CC ) hb_dbfCompile, + ( DBENTRYP_I ) hb_dbfError, + ( DBENTRYP_I ) hb_dbfEvalBlock, + ( DBENTRYP_VSP ) hb_dbfRawLock, + ( DBENTRYP_VL ) hb_dbfLock, + ( DBENTRYP_I ) hb_dbfUnLock, + ( DBENTRYP_V ) hb_dbfCloseMemFile, + ( DBENTRYP_VO ) hb_dbfCreateMemFile, + ( DBENTRYP_SCCS ) hb_dbfGetValueFile, + ( DBENTRYP_VO ) hb_dbfOpenMemFile, + ( DBENTRYP_SCCS ) hb_dbfPutValueFile, + ( DBENTRYP_V ) hb_dbfReadDBHeader, + ( DBENTRYP_V ) hb_dbfWriteDBHeader, + ( DBENTRYP_R ) hb_dbfInit, + ( DBENTRYP_R ) hb_dbfExit, + ( DBENTRYP_RVVL ) hb_dbfDrop, + ( DBENTRYP_RVVL ) hb_dbfExists, + ( DBENTRYP_RVVVL ) hb_dbfRename, + ( DBENTRYP_RSLV ) hb_dbfRddInfo, + ( DBENTRYP_SVP ) hb_dbfWhoCares + }; HB_FUNC( _DBF ) { ; } diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 548fbe0bc3..fcf737842e 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -133,155 +133,6 @@ static void hb_cdxSortFree( LPCDXSORTINFO pSort ); static USHORT s_uiRddId = ( USHORT ) -1; static RDDFUNCS cdxSuper; -static const RDDFUNCS cdxTable = -{ - - /* Movement and positioning methods */ - - ( DBENTRYP_BP ) hb_cdxBof, - ( DBENTRYP_BP ) hb_cdxEof, - ( DBENTRYP_BP ) hb_cdxFound, - ( DBENTRYP_V ) hb_cdxGoBottom, - ( DBENTRYP_UL ) hb_cdxGoTo, - ( DBENTRYP_I ) hb_cdxGoToId, - ( DBENTRYP_V ) hb_cdxGoTop, - ( DBENTRYP_BIB ) hb_cdxSeek, - ( DBENTRYP_L ) hb_cdxSkip, - ( DBENTRYP_L ) hb_cdxSkipFilter, - ( DBENTRYP_L ) hb_cdxSkipRaw, - - - /* Data management */ - - ( DBENTRYP_VF ) hb_cdxAddField, - ( DBENTRYP_B ) hb_cdxAppend, - ( DBENTRYP_I ) hb_cdxCreateFields, - ( DBENTRYP_V ) hb_cdxDeleteRec, - ( DBENTRYP_BP ) hb_cdxDeleted, - ( DBENTRYP_SP ) hb_cdxFieldCount, - ( DBENTRYP_VF ) hb_cdxFieldDisplay, - ( DBENTRYP_SSI ) hb_cdxFieldInfo, - ( DBENTRYP_SCP ) hb_cdxFieldName, - ( DBENTRYP_V ) hb_cdxFlush, - ( DBENTRYP_PP ) hb_cdxGetRec, - ( DBENTRYP_SI ) hb_cdxGetValue, - ( DBENTRYP_SVL ) hb_cdxGetVarLen, - ( DBENTRYP_V ) hb_cdxGoCold, - ( DBENTRYP_V ) hb_cdxGoHot, - ( DBENTRYP_P ) hb_cdxPutRec, - ( DBENTRYP_SI ) hb_cdxPutValue, - ( DBENTRYP_V ) hb_cdxRecall, - ( DBENTRYP_ULP ) hb_cdxRecCount, - ( DBENTRYP_ISI ) hb_cdxRecInfo, - ( DBENTRYP_ULP ) hb_cdxRecNo, - ( DBENTRYP_I ) hb_cdxRecId, - ( DBENTRYP_S ) hb_cdxSetFieldExtent, - - - /* WorkArea/Database management */ - - ( DBENTRYP_CP ) hb_cdxAlias, - ( DBENTRYP_V ) hb_cdxClose, - ( DBENTRYP_VO ) hb_cdxCreate, - ( DBENTRYP_SI ) hb_cdxInfo, - ( DBENTRYP_V ) hb_cdxNewArea, - ( DBENTRYP_VO ) hb_cdxOpen, - ( DBENTRYP_V ) hb_cdxRelease, - ( DBENTRYP_SP ) hb_cdxStructSize, - ( DBENTRYP_CP ) hb_cdxSysName, - ( DBENTRYP_VEI ) hb_cdxEval, - ( DBENTRYP_V ) hb_cdxPack, - ( DBENTRYP_LSP ) hb_cdxPackRec, - ( DBENTRYP_VS ) hb_cdxSort, - ( DBENTRYP_VT ) hb_cdxTrans, - ( DBENTRYP_VT ) hb_cdxTransRec, - ( DBENTRYP_V ) hb_cdxZap, - - - /* Relational Methods */ - - ( DBENTRYP_VR ) hb_cdxChildEnd, - ( DBENTRYP_VR ) hb_cdxChildStart, - ( DBENTRYP_VR ) hb_cdxChildSync, - ( DBENTRYP_V ) hb_cdxSyncChildren, - ( DBENTRYP_V ) hb_cdxClearRel, - ( DBENTRYP_V ) hb_cdxForceRel, - ( DBENTRYP_SSP ) hb_cdxRelArea, - ( DBENTRYP_VR ) hb_cdxRelEval, - ( DBENTRYP_SI ) hb_cdxRelText, - ( DBENTRYP_VR ) hb_cdxSetRel, - - - /* Order Management */ - - ( DBENTRYP_VOI ) hb_cdxOrderListAdd, - ( DBENTRYP_V ) hb_cdxOrderListClear, - ( DBENTRYP_VOI ) hb_cdxOrderListDelete, - ( DBENTRYP_VOI ) hb_cdxOrderListFocus, - ( DBENTRYP_V ) hb_cdxOrderListRebuild, - ( DBENTRYP_VOO ) hb_cdxOrderCondition, - ( DBENTRYP_VOC ) hb_cdxOrderCreate, - ( DBENTRYP_VOI ) hb_cdxOrderDestroy, - ( DBENTRYP_SVOI ) hb_cdxOrderInfo, - - - /* Filters and Scope Settings */ - - ( DBENTRYP_V ) hb_cdxClearFilter, - ( DBENTRYP_V ) hb_cdxClearLocate, - ( DBENTRYP_V ) hb_cdxClearScope, - ( DBENTRYP_VPLP ) hb_cdxCountScope, - ( DBENTRYP_I ) hb_cdxFilterText, - ( DBENTRYP_SI ) hb_cdxScopeInfo, - ( DBENTRYP_VFI ) hb_cdxSetFilter, - ( DBENTRYP_VLO ) hb_cdxSetLocate, - ( DBENTRYP_VOS ) hb_cdxSetScope, - ( DBENTRYP_VPL ) hb_cdxSkipScope, - ( DBENTRYP_B ) hb_cdxLocate, - - - /* Miscellaneous */ - - ( DBENTRYP_CC ) hb_cdxCompile, - ( DBENTRYP_I ) hb_cdxError, - ( DBENTRYP_I ) hb_cdxEvalBlock, - - - /* Network operations */ - - ( DBENTRYP_VSP ) hb_cdxRawLock, - ( DBENTRYP_VL ) hb_cdxLock, - ( DBENTRYP_I ) hb_cdxUnLock, - - - /* Memofile functions */ - - ( DBENTRYP_V ) hb_cdxCloseMemFile, - ( DBENTRYP_VO ) hb_cdxCreateMemFile, - ( DBENTRYP_SCCS ) hb_cdxGetValueFile, - ( DBENTRYP_VO ) hb_cdxOpenMemFile, - ( DBENTRYP_SCCS ) hb_cdxPutValueFile, - - - /* Database file header handling */ - - ( DBENTRYP_V ) hb_cdxReadDBHeader, - ( DBENTRYP_V ) hb_cdxWriteDBHeader, - - - /* non WorkArea functions */ - ( DBENTRYP_R ) hb_cdxInit, - ( DBENTRYP_R ) hb_cdxExit, - ( DBENTRYP_RVVL ) hb_cdxDrop, - ( DBENTRYP_RVVL ) hb_cdxExists, - ( DBENTRYP_RVVVL ) hb_cdxRename, - ( DBENTRYP_RSLV ) hb_cdxRddInfo, - - - /* Special and reserved methods */ - - ( DBENTRYP_SVP ) hb_cdxWhoCares -}; #ifdef HB_CDX_DSPDBG_INFO @@ -331,6 +182,7 @@ static SHORT cdxStackSize = 0; static SHORT cdxTmpStackSize = 0; #endif + /* * internal DBFCDX function */ @@ -9784,6 +9636,159 @@ static void hb_cdxTagDoIndex( LPCDXTAG pTag, BOOL fReindex ) #endif } + +static const RDDFUNCS cdxTable = +{ + + /* Movement and positioning methods */ + + ( DBENTRYP_BP ) NULL, /* hb_cdxBof */ + ( DBENTRYP_BP ) NULL, /* hb_cdxEof */ + ( DBENTRYP_BP ) NULL, /* hb_cdxFound */ + ( DBENTRYP_V ) hb_cdxGoBottom, + ( DBENTRYP_UL ) NULL, /* hb_cdxGoTo */ + ( DBENTRYP_I ) NULL, /* hb_cdxGoToId */ + ( DBENTRYP_V ) hb_cdxGoTop, + ( DBENTRYP_BIB ) hb_cdxSeek, + ( DBENTRYP_L ) hb_cdxSkip, + ( DBENTRYP_L ) NULL, /* hb_cdxSkipFilter */ + ( DBENTRYP_L ) hb_cdxSkipRaw, + + + /* Data management */ + + ( DBENTRYP_VF ) NULL, /* hb_cdxAddField */ + ( DBENTRYP_B ) NULL, /* hb_cdxAppend */ + ( DBENTRYP_I ) NULL, /* hb_cdxCreateFields */ + ( DBENTRYP_V ) NULL, /* hb_cdxDeleteRec */ + ( DBENTRYP_BP ) NULL, /* hb_cdxDeleted */ + ( DBENTRYP_SP ) NULL, /* hb_cdxFieldCount */ + ( DBENTRYP_VF ) NULL, /* hb_cdxFieldDisplay */ + ( DBENTRYP_SSI ) NULL, /* hb_cdxFieldInfo */ + ( DBENTRYP_SCP ) NULL, /* hb_cdxFieldName */ + ( DBENTRYP_V ) hb_cdxFlush, + ( DBENTRYP_PP ) NULL, /* hb_cdxGetRec */ + ( DBENTRYP_SI ) NULL, /* hb_cdxGetValue */ + ( DBENTRYP_SVL ) NULL, /* hb_cdxGetVarLen */ + ( DBENTRYP_V ) hb_cdxGoCold, + ( DBENTRYP_V ) hb_cdxGoHot, + ( DBENTRYP_P ) NULL, /* hb_cdxPutRec */ + ( DBENTRYP_SI ) NULL, /* hb_cdxPutValue */ + ( DBENTRYP_V ) NULL, /* hb_cdxRecall */ + ( DBENTRYP_ULP ) NULL, /* hb_cdxRecCount */ + ( DBENTRYP_ISI ) NULL, /* hb_cdxRecInfo */ + ( DBENTRYP_ULP ) NULL, /* hb_cdxRecNo */ + ( DBENTRYP_I ) NULL, /* hb_cdxRecId */ + ( DBENTRYP_S ) NULL, /* hb_cdxSetFieldExtent */ + + + /* WorkArea/Database management */ + + ( DBENTRYP_CP ) NULL, /* hb_cdxAlias */ + ( DBENTRYP_V ) hb_cdxClose, + ( DBENTRYP_VO ) NULL, /* hb_cdxCreate */ + ( DBENTRYP_SI ) NULL, /* hb_cdxInfo */ + ( DBENTRYP_V ) NULL, /* hb_cdxNewArea */ + ( DBENTRYP_VO ) hb_cdxOpen, + ( DBENTRYP_V ) NULL, /* hb_cdxRelease */ + ( DBENTRYP_SP ) hb_cdxStructSize, + ( DBENTRYP_CP ) NULL, /* hb_cdxSysName */ + ( DBENTRYP_VEI ) NULL, /* hb_cdxEval */ + ( DBENTRYP_V ) hb_cdxPack, + ( DBENTRYP_LSP ) NULL, /* hb_cdxPackRec */ + ( DBENTRYP_VS ) NULL, /* hb_cdxSort */ + ( DBENTRYP_VT ) NULL, /* hb_cdxTrans */ + ( DBENTRYP_VT ) NULL, /* hb_cdxTransRec */ + ( DBENTRYP_V ) hb_cdxZap, + + + /* Relational Methods */ + + ( DBENTRYP_VR ) NULL, /* hb_cdxChildEnd */ + ( DBENTRYP_VR ) NULL, /* hb_cdxChildStart */ + ( DBENTRYP_VR ) NULL, /* hb_cdxChildSync */ + ( DBENTRYP_V ) NULL, /* hb_cdxSyncChildren */ + ( DBENTRYP_V ) NULL, /* hb_cdxClearRel */ + ( DBENTRYP_V ) NULL, /* hb_cdxForceRel */ + ( DBENTRYP_SSP ) NULL, /* hb_cdxRelArea */ + ( DBENTRYP_VR ) NULL, /* hb_cdxRelEval */ + ( DBENTRYP_SI ) NULL, /* hb_cdxRelText */ + ( DBENTRYP_VR ) NULL, /* hb_cdxSetRel */ + + + /* Order Management */ + + ( DBENTRYP_VOI ) hb_cdxOrderListAdd, + ( DBENTRYP_V ) hb_cdxOrderListClear, + ( DBENTRYP_VOI ) hb_cdxOrderListDelete, + ( DBENTRYP_VOI ) hb_cdxOrderListFocus, + ( DBENTRYP_V ) hb_cdxOrderListRebuild, + ( DBENTRYP_VOO ) NULL, /* hb_cdxOrderCondition */ + ( DBENTRYP_VOC ) hb_cdxOrderCreate, + ( DBENTRYP_VOI ) hb_cdxOrderDestroy, + ( DBENTRYP_SVOI ) hb_cdxOrderInfo, + + + /* Filters and Scope Settings */ + + ( DBENTRYP_V ) hb_cdxClearFilter, + ( DBENTRYP_V ) NULL, /* hb_cdxClearLocate */ + ( DBENTRYP_V ) NULL, /* hb_cdxClearScope */ + ( DBENTRYP_VPLP ) hb_cdxCountScope, + ( DBENTRYP_I ) NULL, /* hb_cdxFilterText */ + ( DBENTRYP_SI ) NULL, /* hb_cdxScopeInfo */ + ( DBENTRYP_VFI ) hb_cdxSetFilter, + ( DBENTRYP_VLO ) NULL, /* hb_cdxSetLocate */ + ( DBENTRYP_VOS ) NULL, /* hb_cdxSetScope */ + ( DBENTRYP_VPL ) NULL, /* hb_cdxSkipScope */ + ( DBENTRYP_B ) NULL, /* hb_cdxLocate */ + + + /* Miscellaneous */ + + ( DBENTRYP_CC ) NULL, /* hb_cdxCompile */ + ( DBENTRYP_I ) NULL, /* hb_cdxError */ + ( DBENTRYP_I ) NULL, /* hb_cdxEvalBlock */ + + + /* Network operations */ + + ( DBENTRYP_VSP ) NULL, /* hb_cdxRawLock */ + ( DBENTRYP_VL ) NULL, /* hb_cdxLock */ + ( DBENTRYP_I ) NULL, /* hb_cdxUnLock */ + + + /* Memofile functions */ + + ( DBENTRYP_V ) NULL, /* hb_cdxCloseMemFile */ + ( DBENTRYP_VO ) NULL, /* hb_cdxCreateMemFile */ + ( DBENTRYP_SCCS ) NULL, /* hb_cdxGetValueFile */ + ( DBENTRYP_VO ) NULL, /* hb_cdxOpenMemFile */ + ( DBENTRYP_SCCS ) NULL, /* hb_cdxPutValueFile */ + + + /* Database file header handling */ + + ( DBENTRYP_V ) NULL, /* hb_cdxReadDBHeader */ + ( DBENTRYP_V ) NULL, /* hb_cdxWriteDBHeader */ + + + /* non WorkArea functions */ + + ( DBENTRYP_R ) NULL, /* hb_cdxInit */ + ( DBENTRYP_R ) NULL, /* hb_cdxExit */ + ( DBENTRYP_RVVL ) NULL, /* hb_cdxDrop */ + ( DBENTRYP_RVVL ) NULL, /* hb_cdxExists */ + ( DBENTRYP_RVVVL ) NULL, /* hb_cdxRename */ + ( DBENTRYP_RSLV ) hb_cdxRddInfo, + + + /* Special and reserved methods */ + + ( DBENTRYP_SVP ) NULL /* hb_cdxWhoCares */ +}; + + HB_FUNC_EXTERN( _DBF ); #if defined( HB_SIXCDX ) diff --git a/harbour/source/rdd/dbffpt/dbffpt1.c b/harbour/source/rdd/dbffpt/dbffpt1.c index 6996ae8667..fd5685fd38 100644 --- a/harbour/source/rdd/dbffpt/dbffpt1.c +++ b/harbour/source/rdd/dbffpt/dbffpt1.c @@ -91,154 +91,6 @@ static USHORT s_uiRddIdBLOB = ( USHORT ) -1; static USHORT s_uiRddIdFPT = ( USHORT ) -1; static RDDFUNCS fptSuper; -static const RDDFUNCS fptTable = -{ - - /* Movement and positioning methods */ - - ( DBENTRYP_BP ) hb_fptBof, - ( DBENTRYP_BP ) hb_fptEof, - ( DBENTRYP_BP ) hb_fptFound, - ( DBENTRYP_V ) hb_fptGoBottom, - ( DBENTRYP_UL ) hb_fptGoTo, - ( DBENTRYP_I ) hb_fptGoToId, - ( DBENTRYP_V ) hb_fptGoTop, - ( DBENTRYP_BIB ) hb_fptSeek, - ( DBENTRYP_L ) hb_fptSkip, - ( DBENTRYP_L ) hb_fptSkipFilter, - ( DBENTRYP_L ) hb_fptSkipRaw, - - - /* Data management */ - - ( DBENTRYP_VF ) hb_fptAddField, - ( DBENTRYP_B ) hb_fptAppend, - ( DBENTRYP_I ) hb_fptCreateFields, - ( DBENTRYP_V ) hb_fptDeleteRec, - ( DBENTRYP_BP ) hb_fptDeleted, - ( DBENTRYP_SP ) hb_fptFieldCount, - ( DBENTRYP_VF ) hb_fptFieldDisplay, - ( DBENTRYP_SSI ) hb_fptFieldInfo, - ( DBENTRYP_SCP ) hb_fptFieldName, - ( DBENTRYP_V ) hb_fptFlush, - ( DBENTRYP_PP ) hb_fptGetRec, - ( DBENTRYP_SI ) hb_fptGetValue, - ( DBENTRYP_SVL ) hb_fptGetVarLen, - ( DBENTRYP_V ) hb_fptGoCold, - ( DBENTRYP_V ) hb_fptGoHot, - ( DBENTRYP_P ) hb_fptPutRec, - ( DBENTRYP_SI ) hb_fptPutValue, - ( DBENTRYP_V ) hb_fptRecall, - ( DBENTRYP_ULP ) hb_fptRecCount, - ( DBENTRYP_ISI ) hb_fptRecInfo, - ( DBENTRYP_ULP ) hb_fptRecNo, - ( DBENTRYP_I ) hb_fptRecId, - ( DBENTRYP_S ) hb_fptSetFieldExtent, - - - /* WorkArea/Database management */ - - ( DBENTRYP_CP ) hb_fptAlias, - ( DBENTRYP_V ) hb_fptClose, - ( DBENTRYP_VO ) hb_fptCreate, - ( DBENTRYP_SI ) hb_fptInfo, - ( DBENTRYP_V ) hb_fptNewArea, - ( DBENTRYP_VO ) hb_fptOpen, - ( DBENTRYP_V ) hb_fptRelease, - ( DBENTRYP_SP ) hb_fptStructSize, - ( DBENTRYP_CP ) hb_fptSysName, - ( DBENTRYP_VEI ) hb_fptEval, - ( DBENTRYP_V ) hb_fptPack, - ( DBENTRYP_LSP ) hb_fptPackRec, - ( DBENTRYP_VS ) hb_fptSort, - ( DBENTRYP_VT ) hb_fptTrans, - ( DBENTRYP_VT ) hb_fptTransRec, - ( DBENTRYP_V ) hb_fptZap, - - - /* Relational Methods */ - - ( DBENTRYP_VR ) hb_fptChildEnd, - ( DBENTRYP_VR ) hb_fptChildStart, - ( DBENTRYP_VR ) hb_fptChildSync, - ( DBENTRYP_V ) hb_fptSyncChildren, - ( DBENTRYP_V ) hb_fptClearRel, - ( DBENTRYP_V ) hb_fptForceRel, - ( DBENTRYP_SSP ) hb_fptRelArea, - ( DBENTRYP_VR ) hb_fptRelEval, - ( DBENTRYP_SI ) hb_fptRelText, - ( DBENTRYP_VR ) hb_fptSetRel, - - - /* Order Management */ - - ( DBENTRYP_VOI ) hb_fptOrderListAdd, - ( DBENTRYP_V ) hb_fptOrderListClear, - ( DBENTRYP_VOI ) hb_fptOrderListDelete, - ( DBENTRYP_VOI ) hb_fptOrderListFocus, - ( DBENTRYP_V ) hb_fptOrderListRebuild, - ( DBENTRYP_VOO ) hb_fptOrderCondition, - ( DBENTRYP_VOC ) hb_fptOrderCreate, - ( DBENTRYP_VOI ) hb_fptOrderDestroy, - ( DBENTRYP_SVOI ) hb_fptOrderInfo, - - - /* Filters and Scope Settings */ - - ( DBENTRYP_V ) hb_fptClearFilter, - ( DBENTRYP_V ) hb_fptClearLocate, - ( DBENTRYP_V ) hb_fptClearScope, - ( DBENTRYP_VPLP ) hb_fptCountScope, - ( DBENTRYP_I ) hb_fptFilterText, - ( DBENTRYP_SI ) hb_fptScopeInfo, - ( DBENTRYP_VFI ) hb_fptSetFilter, - ( DBENTRYP_VLO ) hb_fptSetLocate, - ( DBENTRYP_VOS ) hb_fptSetScope, - ( DBENTRYP_VPL ) hb_fptSkipScope, - ( DBENTRYP_B ) hb_fptLocate, - - - /* Miscellaneous */ - - ( DBENTRYP_CC ) hb_fptCompile, - ( DBENTRYP_I ) hb_fptError, - ( DBENTRYP_I ) hb_fptEvalBlock, - - - /* Network operations */ - - ( DBENTRYP_VSP ) hb_fptRawLock, - ( DBENTRYP_VL ) hb_fptLock, - ( DBENTRYP_I ) hb_fptUnLock, - - - /* Memofile functions */ - - ( DBENTRYP_V ) hb_fptCloseMemFile, - ( DBENTRYP_VO ) hb_fptCreateMemFile, - ( DBENTRYP_SCCS ) hb_fptGetValueFile, - ( DBENTRYP_VO ) hb_fptOpenMemFile, - ( DBENTRYP_SCCS ) hb_fptPutValueFile, - - - /* Database file header handling */ - - ( DBENTRYP_V ) hb_fptReadDBHeader, - ( DBENTRYP_V ) hb_fptWriteDBHeader, - - - /* non WorkArea functions */ - ( DBENTRYP_R ) hb_fptInit, - ( DBENTRYP_R ) hb_fptExit, - ( DBENTRYP_RVVL ) hb_fptDrop, - ( DBENTRYP_RVVL ) hb_fptExists, - ( DBENTRYP_RVVVL ) hb_fptRename, - ( DBENTRYP_RSLV ) hb_fptRddInfo, - - /* Special and reserved methods */ - - ( DBENTRYP_SVP ) hb_fptWhoCares -}; /* * generate Run-Time error @@ -318,8 +170,6 @@ static BOOL hb_fptFileLockEx( FPTAREAP pArea, BOOL fWait ) /* * Shared lock memo file. */ - - static BOOL hb_fptFileLockSh( FPTAREAP pArea, BOOL fWait ) { BOOL fRet; @@ -5260,6 +5110,159 @@ static HB_ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect return HB_SUCCESS; } + +static const RDDFUNCS fptTable = +{ + + /* Movement and positioning methods */ + + ( DBENTRYP_BP ) NULL, /* hb_fptBof */ + ( DBENTRYP_BP ) NULL, /* hb_fptEof */ + ( DBENTRYP_BP ) NULL, /* hb_fptFound */ + ( DBENTRYP_V ) NULL, /* hb_fptGoBottom */ + ( DBENTRYP_UL ) NULL, /* hb_fptGoTo */ + ( DBENTRYP_I ) NULL, /* hb_fptGoToId */ + ( DBENTRYP_V ) NULL, /* hb_fptGoTop */ + ( DBENTRYP_BIB ) NULL, /* hb_fptSeek */ + ( DBENTRYP_L ) NULL, /* hb_fptSkip */ + ( DBENTRYP_L ) NULL, /* hb_fptSkipFilter */ + ( DBENTRYP_L ) NULL, /* hb_fptSkipRaw */ + + + /* Data management */ + + ( DBENTRYP_VF ) NULL, /* hb_fptAddField */ + ( DBENTRYP_B ) NULL, /* hb_fptAppend */ + ( DBENTRYP_I ) NULL, /* hb_fptCreateFields */ + ( DBENTRYP_V ) NULL, /* hb_fptDeleteRec */ + ( DBENTRYP_BP ) NULL, /* hb_fptDeleted */ + ( DBENTRYP_SP ) NULL, /* hb_fptFieldCount */ + ( DBENTRYP_VF ) NULL, /* hb_fptFieldDisplay */ + ( DBENTRYP_SSI ) hb_fptFieldInfo, + ( DBENTRYP_SCP ) NULL, /* hb_fptFieldName */ + ( DBENTRYP_V ) NULL, /* hb_fptFlush */ + ( DBENTRYP_PP ) NULL, /* hb_fptGetRec */ + ( DBENTRYP_SI ) hb_fptGetValue, + ( DBENTRYP_SVL ) hb_fptGetVarLen, + ( DBENTRYP_V ) NULL, /* hb_fptGoCold */ + ( DBENTRYP_V ) NULL, /* hb_fptGoHot */ + ( DBENTRYP_P ) NULL, /* hb_fptPutRec */ + ( DBENTRYP_SI ) hb_fptPutValue, + ( DBENTRYP_V ) NULL, /* hb_fptRecall */ + ( DBENTRYP_ULP ) NULL, /* hb_fptRecCount */ + ( DBENTRYP_ISI ) NULL, /* hb_fptRecInfo */ + ( DBENTRYP_ULP ) NULL, /* hb_fptRecNo */ + ( DBENTRYP_I ) NULL, /* hb_fptRecId */ + ( DBENTRYP_S ) NULL, /* hb_fptSetFieldExtent */ + + + /* WorkArea/Database management */ + + ( DBENTRYP_CP ) NULL, /* hb_fptAlias */ + ( DBENTRYP_V ) NULL, /* hb_fptClose */ + ( DBENTRYP_VO ) NULL, /* hb_fptCreate */ + ( DBENTRYP_SI ) hb_fptInfo, + ( DBENTRYP_V ) NULL, /* hb_fptNewArea */ + ( DBENTRYP_VO ) NULL, /* hb_fptOpen */ + ( DBENTRYP_V ) NULL, /* hb_fptRelease */ + ( DBENTRYP_SP ) hb_fptStructSize, + ( DBENTRYP_CP ) NULL, /* hb_fptSysName */ + ( DBENTRYP_VEI ) NULL, /* hb_fptEval */ + ( DBENTRYP_V ) hb_fptPack, + ( DBENTRYP_LSP ) hb_fptPackRec, + ( DBENTRYP_VS ) NULL, /* hb_fptSort */ + ( DBENTRYP_VT ) NULL, /* hb_fptTrans */ + ( DBENTRYP_VT ) NULL, /* hb_fptTransRec */ + ( DBENTRYP_V ) NULL, /* hb_fptZap */ + + + /* Relational Methods */ + + ( DBENTRYP_VR ) NULL, /* hb_fptChildEnd */ + ( DBENTRYP_VR ) NULL, /* hb_fptChildStart */ + ( DBENTRYP_VR ) NULL, /* hb_fptChildSync */ + ( DBENTRYP_V ) NULL, /* hb_fptSyncChildren */ + ( DBENTRYP_V ) NULL, /* hb_fptClearRel */ + ( DBENTRYP_V ) NULL, /* hb_fptForceRel */ + ( DBENTRYP_SSP ) NULL, /* hb_fptRelArea */ + ( DBENTRYP_VR ) NULL, /* hb_fptRelEval */ + ( DBENTRYP_SI ) NULL, /* hb_fptRelText */ + ( DBENTRYP_VR ) NULL, /* hb_fptSetRel */ + + + /* Order Management */ + + ( DBENTRYP_VOI ) NULL, /* hb_fptOrderListAdd */ + ( DBENTRYP_V ) NULL, /* hb_fptOrderListClear */ + ( DBENTRYP_VOI ) NULL, /* hb_fptOrderListDelete */ + ( DBENTRYP_VOI ) NULL, /* hb_fptOrderListFocus */ + ( DBENTRYP_V ) NULL, /* hb_fptOrderListRebuild */ + ( DBENTRYP_VOO ) NULL, /* hb_fptOrderCondition */ + ( DBENTRYP_VOC ) NULL, /* hb_fptOrderCreate */ + ( DBENTRYP_VOI ) NULL, /* hb_fptOrderDestroy */ + ( DBENTRYP_SVOI ) NULL, /* hb_fptOrderInfo */ + + + /* Filters and Scope Settings */ + + ( DBENTRYP_V ) NULL, /* hb_fptClearFilter */ + ( DBENTRYP_V ) NULL, /* hb_fptClearLocate */ + ( DBENTRYP_V ) NULL, /* hb_fptClearScope */ + ( DBENTRYP_VPLP ) NULL, /* hb_fptCountScope */ + ( DBENTRYP_I ) NULL, /* hb_fptFilterText */ + ( DBENTRYP_SI ) NULL, /* hb_fptScopeInfo */ + ( DBENTRYP_VFI ) NULL, /* hb_fptSetFilter */ + ( DBENTRYP_VLO ) NULL, /* hb_fptSetLocate */ + ( DBENTRYP_VOS ) NULL, /* hb_fptSetScope */ + ( DBENTRYP_VPL ) NULL, /* hb_fptSkipScope */ + ( DBENTRYP_B ) NULL, /* hb_fptLocate */ + + + /* Miscellaneous */ + + ( DBENTRYP_CC ) NULL, /* hb_fptCompile */ + ( DBENTRYP_I ) NULL, /* hb_fptError */ + ( DBENTRYP_I ) NULL, /* hb_fptEvalBlock */ + + + /* Network operations */ + + ( DBENTRYP_VSP ) NULL, /* hb_fptRawLock */ + ( DBENTRYP_VL ) NULL, /* hb_fptLock */ + ( DBENTRYP_I ) NULL, /* hb_fptUnLock */ + + + /* Memofile functions */ + + ( DBENTRYP_V ) NULL, /* hb_fptCloseMemFile */ + ( DBENTRYP_VO ) hb_fptCreateMemFile, + ( DBENTRYP_SCCS ) hb_fptGetValueFile, + ( DBENTRYP_VO ) hb_fptOpenMemFile, + ( DBENTRYP_SCCS ) hb_fptPutValueFile, + + + /* Database file header handling */ + + ( DBENTRYP_V ) NULL, /* hb_fptReadDBHeader */ + ( DBENTRYP_V ) NULL, /* hb_fptWriteDBHeader */ + + + /* non WorkArea functions */ + + ( DBENTRYP_R ) NULL, /* hb_fptInit */ + ( DBENTRYP_R ) NULL, /* hb_fptExit */ + ( DBENTRYP_RVVL ) NULL, /* hb_fptDrop */ + ( DBENTRYP_RVVL ) NULL, /* hb_fptExists */ + ( DBENTRYP_RVVVL ) NULL, /* hb_fptRename */ + ( DBENTRYP_RSLV ) hb_fptRddInfo, + + + /* Special and reserved methods */ + + ( DBENTRYP_SVP ) NULL /* hb_fptWhoCares */ +}; + + HB_FUNC( DBFDBT ) {;} HB_FUNC( DBFSMT ) {;} HB_FUNC( DBFFPT ) {;} diff --git a/harbour/source/rdd/dbfnsx/dbfnsx1.c b/harbour/source/rdd/dbfnsx/dbfnsx1.c index 9eb2ebe942..2da1044c53 100644 --- a/harbour/source/rdd/dbfnsx/dbfnsx1.c +++ b/harbour/source/rdd/dbfnsx/dbfnsx1.c @@ -8052,14 +8052,14 @@ static const RDDFUNCS nsxTable = { NULL, NULL, NULL, - ( DBENTRYP_V ) hb_nsxGoBottom, + ( DBENTRYP_V ) hb_nsxGoBottom, NULL, NULL, - ( DBENTRYP_V ) hb_nsxTop, - ( DBENTRYP_BIB ) hb_nsxSeek, + ( DBENTRYP_V ) hb_nsxTop, + ( DBENTRYP_BIB ) hb_nsxSeek, NULL, NULL, - ( DBENTRYP_L ) hb_nsxSkipRaw, + ( DBENTRYP_L ) hb_nsxSkipRaw, NULL, NULL, NULL, @@ -8069,12 +8069,12 @@ static const RDDFUNCS nsxTable = { NULL, NULL, NULL, - ( DBENTRYP_V ) hb_nsxFlush, + ( DBENTRYP_V ) hb_nsxFlush, NULL, NULL, NULL, - ( DBENTRYP_V ) hb_nsxGoCold, - ( DBENTRYP_V ) hb_nsxGoHot, + ( DBENTRYP_V ) hb_nsxGoCold, + ( DBENTRYP_V ) hb_nsxGoHot, NULL, NULL, NULL, @@ -8084,21 +8084,21 @@ static const RDDFUNCS nsxTable = { NULL, NULL, NULL, - ( DBENTRYP_V ) hb_nsxClose, + ( DBENTRYP_V ) hb_nsxClose, NULL, NULL, NULL, - ( DBENTRYP_VO ) hb_nsxOpen, + ( DBENTRYP_VO ) hb_nsxOpen, NULL, - ( DBENTRYP_SP ) hb_nsxStructSize, + ( DBENTRYP_SP ) hb_nsxStructSize, NULL, NULL, - ( DBENTRYP_V ) hb_nsxPack, + ( DBENTRYP_V ) hb_nsxPack, NULL, NULL, NULL, NULL, - ( DBENTRYP_V ) hb_nsxZap, + ( DBENTRYP_V ) hb_nsxZap, NULL, NULL, NULL, @@ -8109,19 +8109,19 @@ static const RDDFUNCS nsxTable = { NULL, NULL, NULL, - ( DBENTRYP_VOI ) hb_nsxOrderListAdd, - ( DBENTRYP_V ) hb_nsxOrderListClear, - ( DBENTRYP_VOI ) hb_nsxOrderListDelete, - ( DBENTRYP_VOI ) hb_nsxOrderListFocus, - ( DBENTRYP_V ) hb_nsxOrderListRebuild, + ( DBENTRYP_VOI ) hb_nsxOrderListAdd, + ( DBENTRYP_V ) hb_nsxOrderListClear, + ( DBENTRYP_VOI ) hb_nsxOrderListDelete, + ( DBENTRYP_VOI ) hb_nsxOrderListFocus, + ( DBENTRYP_V ) hb_nsxOrderListRebuild, NULL, - ( DBENTRYP_VOC ) hb_nsxOrderCreate, - ( DBENTRYP_VOI ) hb_nsxOrderDestroy, - ( DBENTRYP_SVOI ) hb_nsxOrderInfo, + ( DBENTRYP_VOC ) hb_nsxOrderCreate, + ( DBENTRYP_VOI ) hb_nsxOrderDestroy, + ( DBENTRYP_SVOI ) hb_nsxOrderInfo, NULL, NULL, NULL, - ( DBENTRYP_VPLP ) hb_nsxCountScope, + ( DBENTRYP_VPLP ) hb_nsxCountScope, NULL, NULL, NULL, diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index 03e6abcbb1..a87c224b1c 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -153,6 +153,7 @@ static ULONG s_rdNO = 0; static ULONG s_wrNO = 0; #endif + static RDDFUNCS ntxSuper; static USHORT s_uiRddId; @@ -5579,11 +5580,15 @@ static HB_ERRCODE hb_ntxReIndex( LPNTXINDEX pIndex ) /* Implementation of exported functions */ -static HB_ERRCODE ntxGoBottom( NTXAREAP pArea ) +#define hb_ntxBof NULL +#define hb_ntxEof NULL +#define hb_ntxFound NULL + +static HB_ERRCODE hb_ntxGoBottom( NTXAREAP pArea ) { HB_ERRCODE retval; - HB_TRACE(HB_TR_DEBUG, ("ntxGoBottom(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxGoBottom(%p)", pArea)); if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return HB_FAILURE; @@ -5616,11 +5621,14 @@ static HB_ERRCODE ntxGoBottom( NTXAREAP pArea ) return retval; } -static HB_ERRCODE ntxGoTop( NTXAREAP pArea ) +#define hb_ntxGoTo NULL +#define hb_ntxGoToId NULL + +static HB_ERRCODE hb_ntxGoTop( NTXAREAP pArea ) { HB_ERRCODE retval; - HB_TRACE(HB_TR_DEBUG, ("ntxGoTop(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxGoTop(%p)", pArea)); if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return HB_FAILURE; @@ -5653,9 +5661,9 @@ static HB_ERRCODE ntxGoTop( NTXAREAP pArea ) return retval; } -static HB_ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) +static HB_ERRCODE hb_ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast ) { - HB_TRACE(HB_TR_DEBUG, ("ntxSeek(%p, %d, %p, %d)", pArea, fSoftSeek, pItem, fFindLast)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxSeek(%p, %d, %p, %d)", pArea, fSoftSeek, pItem, fFindLast)); if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return HB_FAILURE; @@ -5741,12 +5749,15 @@ static HB_ERRCODE ntxSeek( NTXAREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL } } -static HB_ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ) +#define hb_ntxSkip NULL +#define hb_ntxSkipFilter NULL + +static HB_ERRCODE hb_ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ) { HB_ERRCODE retval; BOOL fOut = FALSE, fForward; - HB_TRACE(HB_TR_DEBUG, ("ntxSkipRaw(%p, %ld)", pArea, lToSkip)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxSkipRaw(%p, %ld)", pArea, lToSkip)); if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return HB_FAILURE; @@ -5809,14 +5820,24 @@ static HB_ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ) return retval; } +#define hb_ntxAddField NULL +#define hb_ntxAppend NULL +#define hb_ntxCreateFields NULL +#define hb_ntxDeleteRec NULL +#define hb_ntxDeleted NULL +#define hb_ntxFieldCount NULL +#define hb_ntxFieldDisplay NULL +#define hb_ntxFieldInfo NULL +#define hb_ntxFieldName NULL + /* * Flush _system_ buffers to disk */ -static HB_ERRCODE ntxFlush( NTXAREAP pArea ) +static HB_ERRCODE hb_ntxFlush( NTXAREAP pArea ) { HB_ERRCODE uiError; - HB_TRACE(HB_TR_DEBUG, ("ntxFlush(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxFlush(%p)", pArea)); uiError = SELF_GOCOLD( ( AREAP ) pArea ); if( uiError == HB_SUCCESS ) @@ -5841,15 +5862,19 @@ static HB_ERRCODE ntxFlush( NTXAREAP pArea ) return uiError; } +#define hb_ntxGetRec NULL +#define hb_ntxGetValue NULL +#define hb_ntxGetVarLen NULL + /* * Perform a write of WorkArea memory to the data store. */ -static HB_ERRCODE ntxGoCold( NTXAREAP pArea ) +static HB_ERRCODE hb_ntxGoCold( NTXAREAP pArea ) { BOOL fRecordChanged = pArea->dbfarea.fRecordChanged; BOOL fAppend = pArea->dbfarea.fAppend; - HB_TRACE(HB_TR_DEBUG, ("ntxGoCold(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxGoCold(%p)", pArea)); if( SUPER_GOCOLD( ( AREAP ) pArea ) == HB_SUCCESS ) { @@ -5858,7 +5883,7 @@ static HB_ERRCODE ntxGoCold( NTXAREAP pArea ) if( fAppend && pArea->dbfarea.fShared ) { if( pArea->fNtxAppend ) - hb_errInternal( 9312, "ntxGoCold: multiple appending without GOCOLD.", NULL, NULL ); + hb_errInternal( 9312, "hb_ntxGoCold: multiple appending without GOCOLD.", NULL, NULL ); pArea->fNtxAppend = TRUE; } else @@ -5977,11 +6002,11 @@ static HB_ERRCODE ntxGoCold( NTXAREAP pArea ) /* * Mark the WorkArea data buffer as hot. */ -static HB_ERRCODE ntxGoHot( NTXAREAP pArea ) +static HB_ERRCODE hb_ntxGoHot( NTXAREAP pArea ) { HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxGoHot(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxGoHot(%p)", pArea)); errCode = SUPER_GOHOT( ( AREAP ) pArea ); if( errCode == HB_SUCCESS ) @@ -6015,14 +6040,24 @@ static HB_ERRCODE ntxGoHot( NTXAREAP pArea ) return errCode; } +#define hb_ntxPutRec NULL +#define hb_ntxPutValue NULL +#define hb_ntxRecall NULL +#define hb_ntxRecCount NULL +#define hb_ntxRecInfo NULL +#define hb_ntxRecNo NULL +#define hb_ntxRecId NULL +#define hb_ntxSetFieldsExtent NULL +#define hb_ntxAlias NULL + /* * Close the table in the WorkArea. */ -static HB_ERRCODE ntxClose( NTXAREAP pArea ) +static HB_ERRCODE hb_ntxClose( NTXAREAP pArea ) { HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxClose(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxClose(%p)", pArea)); if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return HB_FAILURE; @@ -6055,13 +6090,17 @@ static HB_ERRCODE ntxClose( NTXAREAP pArea ) return errCode; } +#define hb_ntxCreate NULL +#define hb_ntxInfo NULL +#define hb_ntxNewArea NULL + /* * Retrieve the size of the WorkArea structure. */ -static HB_ERRCODE ntxStructSize( NTXAREAP pArea, USHORT * uiSize ) +static HB_ERRCODE hb_ntxStructSize( NTXAREAP pArea, USHORT * uiSize ) { - HB_TRACE(HB_TR_DEBUG, ("ntxStructSize(%p, %p)", pArea, uiSize)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxStructSize(%p, %p)", pArea, uiSize)); HB_SYMBOL_UNUSED( pArea ); * uiSize = sizeof( NTXAREA ); @@ -6071,11 +6110,11 @@ static HB_ERRCODE ntxStructSize( NTXAREAP pArea, USHORT * uiSize ) /* * Open a data store in the WorkArea. */ -static HB_ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ) +static HB_ERRCODE hb_ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ) { HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxOpen(%p, %p)", pArea, pOpenInfo)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOpen(%p, %p)", pArea, pOpenInfo)); errCode = SUPER_OPEN( ( AREAP ) pArea, pOpenInfo ); @@ -6112,10 +6151,14 @@ static HB_ERRCODE ntxOpen( NTXAREAP pArea, LPDBOPENINFO pOpenInfo ) return errCode; } -static HB_ERRCODE ntxPack( NTXAREAP pArea ) +#define hb_ntxRelease NULL +#define hb_ntxSysName NULL +#define hb_ntxEval NULL + +static HB_ERRCODE hb_ntxPack( NTXAREAP pArea ) { HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxPack(%p)", pArea )); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxPack(%p)", pArea )); errCode = SUPER_PACK( ( AREAP ) pArea ); if( errCode == HB_SUCCESS ) @@ -6124,11 +6167,16 @@ static HB_ERRCODE ntxPack( NTXAREAP pArea ) return errCode; } -static HB_ERRCODE ntxZap( NTXAREAP pArea ) +#define ntPackRec NULL +#define hb_ntxSort NULL +#define hb_ntxTrans NULL +#define hb_ntxTransRec NULL + +static HB_ERRCODE hb_ntxZap( NTXAREAP pArea ) { HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxZap(%p)", pArea )); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxZap(%p)", pArea )); errCode = SUPER_ZAP( ( AREAP ) pArea ); if( errCode == HB_SUCCESS ) @@ -6137,7 +6185,20 @@ static HB_ERRCODE ntxZap( NTXAREAP pArea ) return errCode; } -static HB_ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) +#define hb_ntxchildEnd NULL +#define hb_ntxchildStart NULL +#define hb_ntxchildSync NULL +#define hb_ntxsyncChildren NULL +#define hb_ntxclearRel NULL +#define hb_ntxforceRel NULL +#define hb_ntxrelArea NULL +#define hb_ntxrelEval NULL +#define hb_ntxrelText NULL +#define hb_ntxsetRel NULL + +#define hb_ntxOrderCondition NULL + +static HB_ERRCODE hb_ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo ) { PHB_ITEM pResult, pKeyExp, pForExp = NULL; int iLen, iDec, iTag, i; @@ -6153,7 +6214,7 @@ static HB_ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo fAscend = TRUE, fCustom = FALSE, fTemporary = FALSE, fExclusive = FALSE; BYTE bType; - HB_TRACE(HB_TR_DEBUG, ("ntxOrderCreate(%p, %p)", pArea, pOrderInfo)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderCreate(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); if( errCode != HB_SUCCESS ) @@ -6565,11 +6626,11 @@ static HB_ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo return SELF_GOTOP( ( AREAP ) pArea ); } -static HB_ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxOrderDestroy(%p, %p)", pArea, pOrderInfo)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderDestroy(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); if( errCode != HB_SUCCESS ) @@ -6636,10 +6697,10 @@ static HB_ERRCODE ntxOrderDestroy( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) return errCode; } -static HB_ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) +static HB_ERRCODE hb_ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo ) { LPTAGINFO pTag; - HB_TRACE(HB_TR_DEBUG, ("ntxOrderInfo(%p, %hu, %p)", pArea, uiIndex, pInfo)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderInfo(%p, %hu, %p)", pArea, uiIndex, pInfo)); switch( uiIndex ) { @@ -7309,18 +7370,7 @@ static HB_ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pI return HB_SUCCESS; } -static HB_ERRCODE ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo ) -{ - HB_TRACE(HB_TR_DEBUG, ("ntxCountScope(%p, %p, %p)", pArea, pPtr, plRecNo)); - - if( pPtr == NULL ) - { - return HB_SUCCESS; - } - return SUPER_COUNTSCOPE( ( AREAP ) pArea, pPtr, plRecNo ); -} - -static HB_ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { USHORT uiFlags; PHB_FILE pFile; @@ -7329,7 +7379,7 @@ static HB_ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) HB_ERRCODE errCode; BOOL fRetry, fReadonly, fShared, fProd; - HB_TRACE(HB_TR_DEBUG, ("ntxOrderListAdd(%p, %p)", pArea, pOrderInfo)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderListAdd(%p, %p)", pArea, pOrderInfo)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); if( errCode != HB_SUCCESS ) @@ -7415,11 +7465,11 @@ static HB_ERRCODE ntxOrderListAdd( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) return errCode; } -static HB_ERRCODE ntxOrderListClear( NTXAREAP pArea ) +static HB_ERRCODE hb_ntxOrderListClear( NTXAREAP pArea ) { LPNTXINDEX *pIndexPtr, pIndex; - HB_TRACE(HB_TR_DEBUG, ("ntxOrderListClear(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderListClear(%p)", pArea)); if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return HB_FAILURE; @@ -7445,14 +7495,14 @@ static HB_ERRCODE ntxOrderListClear( NTXAREAP pArea ) return HB_SUCCESS; } -static HB_ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { char szTagName[ NTX_MAX_TAGNAME + 1 ]; char szFileName[ HB_PATH_MAX ]; LPNTXINDEX pIndex, * pIndexPtr; BOOL fProd; - HB_TRACE(HB_TR_DEBUG, ("ntxOrderListDelete(%p, %p)", pArea, pOrderInfo)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderListDelete(%p, %p)", pArea, pOrderInfo)); if( SELF_GOCOLD( ( AREAP ) pArea ) == HB_FAILURE ) return HB_FAILURE; @@ -7481,9 +7531,9 @@ static HB_ERRCODE ntxOrderListDelete( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) return HB_SUCCESS; } -static HB_ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) +static HB_ERRCODE hb_ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) { - HB_TRACE(HB_TR_DEBUG, ("ntxOrderListFocus(%p, %p)", pArea, pOrderInfo)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderListFocus(%p, %p)", pArea, pOrderInfo)); pOrderInfo->itmResult = hb_itemPutC( pOrderInfo->itmResult, pArea->lpCurTag ? pArea->lpCurTag->TagName : NULL ); @@ -7509,13 +7559,13 @@ static HB_ERRCODE ntxOrderListFocus( NTXAREAP pArea, LPDBORDERINFO pOrderInfo ) return HB_SUCCESS; } -static HB_ERRCODE ntxOrderListRebuild( NTXAREAP pArea ) +static HB_ERRCODE hb_ntxOrderListRebuild( NTXAREAP pArea ) { LPTAGINFO pCurrTag; LPNTXINDEX pIndex; HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxOrderListRebuild(%p)", pArea)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxOrderListRebuild(%p)", pArea)); errCode = SELF_GOCOLD( ( AREAP ) pArea ); if( errCode != HB_SUCCESS ) @@ -7554,11 +7604,47 @@ static HB_ERRCODE ntxOrderListRebuild( NTXAREAP pArea ) return errCode; } -static HB_ERRCODE ntxInit( LPRDDNODE pRDD ) +#define hb_ntxClearFilter NULL +#define hb_ntxClearLocate NULL +#define hb_ntxClearScope NULL + +static HB_ERRCODE hb_ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo ) +{ + HB_TRACE(HB_TR_DEBUG, ("hb_ntxCountScope(%p, %p, %p)", pArea, pPtr, plRecNo)); + + if( pPtr == NULL ) + { + return HB_SUCCESS; + } + return SUPER_COUNTSCOPE( ( AREAP ) pArea, pPtr, plRecNo ); +} + +#define hb_ntxFilterText NULL +#define hb_ntxScopeInfo NULL +#define hb_ntxSetFilter NULL +#define hb_ntxSetLocate NULL +#define hb_ntxSetScope NULL +#define hb_ntxSkipScope NULL +#define hb_ntxLocate NULL +#define hb_ntxCompile NULL +#define hb_ntxError NULL +#define hb_ntxEvalBlock NULL +#define hb_ntxRawLock NULL +#define hb_ntxLock NULL +#define hb_ntxUnLock NULL +#define hb_ntxCloseMemFile NULL +#define hb_ntxCreateMemFile NULL +#define hb_ntxGetValueFile NULL +#define hb_ntxOpenMemFile NULL +#define hb_ntxPutValueFile NULL +#define hb_ntxReadDBHeader NULL +#define hb_ntxWriteDBHeader NULL + +static HB_ERRCODE hb_ntxInit( LPRDDNODE pRDD ) { HB_ERRCODE errCode; - HB_TRACE(HB_TR_DEBUG, ("ntxInit(%p)", pRDD)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxInit(%p)", pRDD)); errCode = SUPER_INIT( pRDD ); if( errCode == HB_SUCCESS ) @@ -7573,11 +7659,16 @@ static HB_ERRCODE ntxInit( LPRDDNODE pRDD ) return errCode; } -static HB_ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) +#define hb_ntxExit NULL +#define hb_ntxDrop NULL +#define hb_ntxExists NULL +#define hb_ntxRename NULL + +static HB_ERRCODE hb_ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, PHB_ITEM pItem ) { LPDBFDATA pData; - HB_TRACE(HB_TR_DEBUG, ("ntxRddInfo(%p, %hu, %lu, %p)", pRDD, uiIndex, ulConnect, pItem)); + HB_TRACE(HB_TR_DEBUG, ("hb_ntxRddInfo(%p, %hu, %lu, %p)", pRDD, uiIndex, ulConnect, pItem)); pData = DBFNODE_DATA( pRDD ); @@ -7658,107 +7749,109 @@ static HB_ERRCODE ntxRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect, P return HB_SUCCESS; } +#define hb_ntxWhoCares NULL + static const RDDFUNCS ntxTable = { - ntxBof, - ntxEof, - ntxFound, - ( DBENTRYP_V ) ntxGoBottom, - ntxGoTo, - ntxGoToId, - ( DBENTRYP_V ) ntxGoTop, - ( DBENTRYP_BIB ) ntxSeek, - ntxSkip, - ntxSkipFilter, - ( DBENTRYP_L ) ntxSkipRaw, - ntxAddField, - ( DBENTRYP_B ) ntxAppend, - ntxCreateFields, - ntxDeleteRec, - ntxDeleted, - ntxFieldCount, - ntxFieldDisplay, - ntxFieldInfo, - ntxFieldName, - ( DBENTRYP_V ) ntxFlush, - ntxGetRec, - ntxGetValue, - ntxGetVarLen, - ( DBENTRYP_V ) ntxGoCold, - ( DBENTRYP_V ) ntxGoHot, - ntxPutRec, - ntxPutValue, - ntxRecall, - ntxRecCount, - ntxRecInfo, - ntxRecNo, - ntxRecId, - ntxSetFieldsExtent, - ntxAlias, - ( DBENTRYP_V ) ntxClose, - ntxCreate, - ntxInfo, - ntxNewArea, - ( DBENTRYP_VO ) ntxOpen, - ntxRelease, - ( DBENTRYP_SP ) ntxStructSize, - ntxSysName, - ntxEval, - ( DBENTRYP_V ) ntxPack, + hb_ntxBof, + hb_ntxEof, + hb_ntxFound, + ( DBENTRYP_V ) hb_ntxGoBottom, + hb_ntxGoTo, + hb_ntxGoToId, + ( DBENTRYP_V ) hb_ntxGoTop, + ( DBENTRYP_BIB ) hb_ntxSeek, + hb_ntxSkip, + hb_ntxSkipFilter, + ( DBENTRYP_L ) hb_ntxSkipRaw, + hb_ntxAddField, + ( DBENTRYP_B ) hb_ntxAppend, + hb_ntxCreateFields, + hb_ntxDeleteRec, + hb_ntxDeleted, + hb_ntxFieldCount, + hb_ntxFieldDisplay, + hb_ntxFieldInfo, + hb_ntxFieldName, + ( DBENTRYP_V ) hb_ntxFlush, + hb_ntxGetRec, + hb_ntxGetValue, + hb_ntxGetVarLen, + ( DBENTRYP_V ) hb_ntxGoCold, + ( DBENTRYP_V ) hb_ntxGoHot, + hb_ntxPutRec, + hb_ntxPutValue, + hb_ntxRecall, + hb_ntxRecCount, + hb_ntxRecInfo, + hb_ntxRecNo, + hb_ntxRecId, + hb_ntxSetFieldsExtent, + hb_ntxAlias, + ( DBENTRYP_V ) hb_ntxClose, + hb_ntxCreate, + hb_ntxInfo, + hb_ntxNewArea, + ( DBENTRYP_VO ) hb_ntxOpen, + hb_ntxRelease, + ( DBENTRYP_SP ) hb_ntxStructSize, + hb_ntxSysName, + hb_ntxEval, + ( DBENTRYP_V ) hb_ntxPack, ntPackRec, - ntxSort, - ntxTrans, - ntxTransRec, - ( DBENTRYP_V ) ntxZap, - ntxchildEnd, - ntxchildStart, - ntxchildSync, - ntxsyncChildren, - ntxclearRel, - ntxforceRel, - ntxrelArea, - ntxrelEval, - ntxrelText, - ntxsetRel, - ( DBENTRYP_VOI ) ntxOrderListAdd, - ( DBENTRYP_V ) ntxOrderListClear, - ( DBENTRYP_VOI ) ntxOrderListDelete, - ( DBENTRYP_VOI ) ntxOrderListFocus, - ( DBENTRYP_V ) ntxOrderListRebuild, - ntxOrderCondition, - ( DBENTRYP_VOC ) ntxOrderCreate, - ( DBENTRYP_VOI ) ntxOrderDestroy, - ( DBENTRYP_SVOI ) ntxOrderInfo, - ntxClearFilter, - ntxClearLocate, - ntxClearScope, - ( DBENTRYP_VPLP ) ntxCountScope, - ntxFilterText, - ntxScopeInfo, - ntxSetFilter, - ntxSetLocate, - ntxSetScope, - ntxSkipScope, - ntxLocate, - ntxCompile, - ntxError, - ntxEvalBlock, - ntxRawLock, - ntxLock, - ntxUnLock, - ntxCloseMemFile, - ntxCreateMemFile, - ntxGetValueFile, - ntxOpenMemFile, - ntxPutValueFile, - ntxReadDBHeader, - ntxWriteDBHeader, - ntxInit, - ntxExit, - ntxDrop, - ntxExists, - ntxRename, - ntxRddInfo, - ntxWhoCares + hb_ntxSort, + hb_ntxTrans, + hb_ntxTransRec, + ( DBENTRYP_V ) hb_ntxZap, + hb_ntxchildEnd, + hb_ntxchildStart, + hb_ntxchildSync, + hb_ntxsyncChildren, + hb_ntxclearRel, + hb_ntxforceRel, + hb_ntxrelArea, + hb_ntxrelEval, + hb_ntxrelText, + hb_ntxsetRel, + ( DBENTRYP_VOI ) hb_ntxOrderListAdd, + ( DBENTRYP_V ) hb_ntxOrderListClear, + ( DBENTRYP_VOI ) hb_ntxOrderListDelete, + ( DBENTRYP_VOI ) hb_ntxOrderListFocus, + ( DBENTRYP_V ) hb_ntxOrderListRebuild, + hb_ntxOrderCondition, + ( DBENTRYP_VOC ) hb_ntxOrderCreate, + ( DBENTRYP_VOI ) hb_ntxOrderDestroy, + ( DBENTRYP_SVOI ) hb_ntxOrderInfo, + hb_ntxClearFilter, + hb_ntxClearLocate, + hb_ntxClearScope, + ( DBENTRYP_VPLP ) hb_ntxCountScope, + hb_ntxFilterText, + hb_ntxScopeInfo, + hb_ntxSetFilter, + hb_ntxSetLocate, + hb_ntxSetScope, + hb_ntxSkipScope, + hb_ntxLocate, + hb_ntxCompile, + hb_ntxError, + hb_ntxEvalBlock, + hb_ntxRawLock, + hb_ntxLock, + hb_ntxUnLock, + hb_ntxCloseMemFile, + hb_ntxCreateMemFile, + hb_ntxGetValueFile, + hb_ntxOpenMemFile, + hb_ntxPutValueFile, + hb_ntxReadDBHeader, + hb_ntxWriteDBHeader, + hb_ntxInit, + hb_ntxExit, + hb_ntxDrop, + hb_ntxExists, + hb_ntxRename, + hb_ntxRddInfo, + hb_ntxWhoCares }; HB_FUNC( DBFNTX ) {;}