From 69cbb0acf9972047adcaf4d400e526fa851f298c Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 14 Dec 2004 00:17:02 +0000 Subject: [PATCH] 2004-12-14 01:15 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rdd/dbfcdx/dbfcdx1.c * minor modifications of some static function names --- harbour/ChangeLog | 4 ++++ harbour/source/rdd/dbfcdx/dbfcdx1.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 36b15617bf..3c1b9055f1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2004-12-14 01:15 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rdd/dbfcdx/dbfcdx1.c + * minor modifications of some static function names + 2004-12-14 01:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/extend.c * harbour/source/vm/itemapi.c diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 128887b0c8..d3464ce4d2 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -4976,11 +4976,11 @@ static BOOL hb_cdxCurKeyRefresh( CDXAREAP pArea, LPCDXTAG pTag ) /* * skip to next unique key */ -static ERRCODE hb_cdxSkipUnique( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward ) +static ERRCODE hb_cdxDBOISkipUnique( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward ) { ERRCODE retval; - HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipUnique(%p, %p, %i)", pArea, pTag, fForward)); + HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipUnique(%p, %p, %i)", pArea, pTag, fForward)); if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) return FAILURE; @@ -5093,7 +5093,7 @@ static BOOL hb_cdxDBOISkipEval( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, { BOOL fFound = FALSE, fFirst = TRUE; - HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipEval(%p, %p, %i, %p)", pArea, pTag, fForward, pEval)); + HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipEval(%p, %p, %i, %p)", pArea, pTag, fForward, pEval)); if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) return FALSE; @@ -5186,7 +5186,7 @@ static BOOL hb_cdxDBOISkipWild( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, BOOL fFound = FALSE, fFirst = TRUE; char *szPattern = hb_itemGetCPtr( pWildItm ); - HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipWild(%p, %p, %i, %p)", pArea, pTag, fForward, pWildItm)); + HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipWild(%p, %p, %i, %p)", pArea, pTag, fForward, pWildItm)); if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) return FALSE; @@ -5283,7 +5283,7 @@ static BOOL hb_cdxDBOISkipRegEx( CDXAREAP pArea, LPCDXTAG pTag, BOOL fForward, char *szMask = hb_itemGetCPtr( pRegExItm ); BOOL fFree = FALSE; - HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipRegEx(%p, %p, %i, %s)", pArea, pTag, fForward, szMask)); + HB_TRACE(HB_TR_DEBUG, ("hb_cdxDBOISkipRegEx(%p, %p, %i, %s)", pArea, pTag, fForward, szMask)); if ( FAST_GOCOLD( ( AREAP ) pArea ) == FAILURE ) return FALSE; @@ -7184,7 +7184,7 @@ static ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pO case DBOI_SKIPUNIQUE: pOrderInfo->itmResult = hb_itemPutL( pOrderInfo->itmResult, - hb_cdxSkipUnique( pArea, pTag, + hb_cdxDBOISkipUnique( pArea, pTag, hb_itemGetNI( pOrderInfo->itmNewVal ) >= 0 ) == SUCCESS ); break;