From b19831d46eb60f0fc909ee66829b6709416438d5 Mon Sep 17 00:00:00 2001 From: Brian Hays Date: Thu, 31 May 2001 05:43:42 +0000 Subject: [PATCH] 2001-05-30 10:49 UTC-0800 Brian Hays --- harbour/ChangeLog | 13 +++++++++++++ harbour/contrib/rdd_ads/ads1.c | 2 +- harbour/source/rdd/dbcmd.c | 8 ++++---- harbour/source/rtl/philes.c | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f00cd1f244..af4eac6595 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,16 @@ +2001-05-30 10:49 UTC-0800 Brian Hays + + * source/rdd/dbcmd.c + * Harrier's fix to NEXT clause in COPY TO command + Thanks, Harrier! + + * contrib/rdd_ads/ads1.c + * corrected commit to only flush current workarea + + * source/rtl/philes.c + * changed HB_FEOF() to HB_F_EOF to avoid collision with the + HB_FEOF() in libmisc/hb_f.c + 2001-05-30 14:15 UTC-0400 David G. Holm * contrib/odbc/odbc.c diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index 751150c1d5..15a8c8fe90 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -1545,7 +1545,7 @@ static ERRCODE adsOrderDestroy( ADSAREAP pArea, LPDBORDERINFO pOrderInfo ) (UNSIGNED8*) hb_itemGetCPtr( pOrderInfo->itmOrder ), &phIndex ); if ( ulRetVal != AE_SUCCESS ) return FAILURE; - ulRetVal = AdsCloseIndex( phIndex ); + ulRetVal = AdsDeleteIndex( phIndex ); if ( ulRetVal != AE_SUCCESS ) return FAILURE; } diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index 16da804992..aa9d1a5cdd 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -3519,12 +3519,12 @@ static ERRCODE rddMoveRecords( char *cAreaFrom, char *cAreaTo, PHB_ITEM pFields, return EG_NOTABLE; } - if ( lRec > 0 ) /*only one record*/ - SELF_GOTO( pAreaFrom, lRec ); /*go there*/ + if ( lRec > 0 ) /* only one record */ + SELF_GOTO( pAreaFrom, lRec ); /* go there */ else { - if( !pWhile && !bRest ) /*this two stay current*/ - SELF_GOTOP( pAreaFrom ); /*else start from the top*/ + if( !pWhile && !bRest && !lNext ) /* these two stay current */ + SELF_GOTOP( pAreaFrom ); /* else start from the top */ } /*move those records assuming we are positioned on one.*/ diff --git a/harbour/source/rtl/philes.c b/harbour/source/rtl/philes.c index 1780c9f075..f8f9fe0cec 100644 --- a/harbour/source/rtl/philes.c +++ b/harbour/source/rtl/philes.c @@ -214,7 +214,7 @@ HB_FUNC( CURDIR ) #ifdef HB_EXTENSION -HB_FUNC( HB_FEOF ) +HB_FUNC( HB_F_EOF ) { if( ISNUM( 1 ) ) {