From b5641e30eec597847a05a0dab70d92146b817c04 Mon Sep 17 00:00:00 2001 From: "Alexander S.Kresin" Date: Thu, 12 Oct 2000 06:31:46 +0000 Subject: [PATCH] 2000-10-12 10:30 GMT+3 Alexander Kresin --- harbour/ChangeLog | 6 ++++++ harbour/contrib/rdd_ads/ads1.c | 2 +- harbour/source/rdd/rddcpy.c | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7eb57c3c18..64760af7f6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +2000-10-12 10:30 GMT+3 Alexander Kresin + * source/rdd/rddcpy.c + * added casts, posted by John Skelton + * contrib/rdd_ads/ads1.c + * minor bug fixed in adsSeek() + 2000-10-11 3:58 UTC+0800 Brian Hays Re-posting changes that had a CVS error yesterday... * contrib/rdd_ads/ads1.c diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index 26fdd6b171..9f6aa58a80 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -394,7 +394,7 @@ static ERRCODE adsSeek( ADSAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFin hb_ndtoa( hb_itemGetND( pKey ), ( char * ) szText, uiLen, uiDec ); szText[ uiLen ] = '\0'; AdsSeekLast( pArea->hOrdCurrent, szText, - 8, ADS_DOUBLEKEY, (UNSIGNED16*) &(pArea->fFound) ); + 8, ADS_STRINGKEY, (UNSIGNED16*) &(pArea->fFound) ); } } else diff --git a/harbour/source/rdd/rddcpy.c b/harbour/source/rdd/rddcpy.c index a9c0aaccfa..761c968ab8 100644 --- a/harbour/source/rdd/rddcpy.c +++ b/harbour/source/rdd/rddcpy.c @@ -146,19 +146,19 @@ static ERRCODE rddMoveRecords( char *cAreaFrom, char *cAreaTo, PHB_ITEM pFields, if ( cAreaTo ) // it's a COPY TO { pAreaRelease = GetTheOtherArea( szDriver, cAreaTo ); - pAreaTo = pAreaRelease->pArea; + pAreaTo = (AREAP) pAreaRelease->pArea; } else - pAreaTo = s_pCurrArea->pArea; + pAreaTo = (AREAP) s_pCurrArea->pArea; if ( cAreaFrom ) // it's an APPEND FROM { // make it current pAreaRelease = s_pCurrArea = GetTheOtherArea( szDriver, cAreaFrom ); - pAreaFrom = pAreaRelease->pArea; + pAreaFrom = (AREAP) pAreaRelease->pArea; } else - pAreaFrom = s_pCurrArea->pArea; + pAreaFrom = (AREAP) s_pCurrArea->pArea; // or one or the other but necer none if ( !pAreaRelease ) // We need another Area to APPEND TO