From db5d53e088c60366b5c680f1e039a91f40ba271b Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 23 Nov 2010 11:01:19 +0000 Subject: [PATCH] 2010-11-23 12:01 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rdd/dbfcdx/dbfcdx1.c ! fixed wrongly used SUPER_DELETED() instead of SELF_DELETED() * harbour/src/rdd/ordwldsk.c ! cleaned typo in error code used by OrdWildSeek() when wrong parameters are passed --- harbour/ChangeLog | 8 ++++++++ harbour/src/rdd/dbfcdx/dbfcdx1.c | 4 ++-- harbour/src/rdd/ordwldsk.c | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ff571abb2d..fbff4c4b8e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-23 12:01 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/rdd/dbfcdx/dbfcdx1.c + ! fixed wrongly used SUPER_DELETED() instead of SELF_DELETED() + + * harbour/src/rdd/ordwldsk.c + ! cleaned typo in error code used by OrdWildSeek() when wrong + parameters are passed + 2010-11-22 10:00 UTC+0100 Miguel Angel Marchuet * contrib/rddbmcdx/bmdbfcdx.c * contrib/rddbmcdx/hbbmcdx.h diff --git a/harbour/src/rdd/dbfcdx/dbfcdx1.c b/harbour/src/rdd/dbfcdx/dbfcdx1.c index 18e75c638d..0b6c85b2d0 100644 --- a/harbour/src/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/src/rdd/dbfcdx/dbfcdx1.c @@ -1096,7 +1096,7 @@ static void hb_cdxIndexPutAvailPage( LPCDXINDEX pIndex, HB_ULONG ulPos, HB_BOOL static void hb_cdxIndexFlushAvailPage( LPCDXINDEX pIndex ) { LPCDXLIST pLst = pIndex->freeLst; - HB_BYTE byPageBuf[CDX_PAGELEN]; + HB_BYTE byPageBuf[ CDX_PAGELEN ]; HB_ULONG ulPos; HB_BOOL fClean = HB_TRUE; @@ -3901,7 +3901,7 @@ static HB_BOOL hb_cdxCheckRecordFilter( CDXAREAP pArea, HB_ULONG ulRecNo ) SELF_GOTO( ( AREAP ) pArea, ulRecNo ); if( fDeleted ) - SUPER_DELETED( ( AREAP ) pArea, &lResult ); + SELF_DELETED( ( AREAP ) pArea, &lResult ); if( !lResult && pArea->dbfarea.area.dbfi.itmCobExpr ) { diff --git a/harbour/src/rdd/ordwldsk.c b/harbour/src/rdd/ordwldsk.c index fe15f0a91c..7bd7ae855d 100644 --- a/harbour/src/rdd/ordwldsk.c +++ b/harbour/src/rdd/ordwldsk.c @@ -102,14 +102,14 @@ HB_FUNC( ORDWILDSEEK ) { OrderInfo.itmNewVal = hb_param( 1, HB_IT_STRING ); if( SELF_ORDINFO( pArea, fBack ? DBOI_SKIPWILDBACK : DBOI_SKIPWILD, - &OrderInfo ) == HB_SUCCESS ) + &OrderInfo ) == HB_SUCCESS ) fFound = hb_itemGetL( OrderInfo.itmResult ); } hb_itemRelease( OrderInfo.itmResult ); hb_retl( fFound ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEPUTBADPARAMETER, NULL, HB_ERR_FUNCNAME ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_SEEK_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );