From c19c6ab4b889310a9304ffb8ebb8a06582fe2d72 Mon Sep 17 00:00:00 2001 From: Jean-Francois Lefebvre Date: Fri, 24 Nov 2000 21:59:06 +0000 Subject: [PATCH] 2000-11-25 22:51 UTC+0100 jfl (mafact) --- harbour/ChangeLog | 4 ++++ harbour/source/rdd/rddcpy.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index da9379cb3f..6260fd8870 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-11-25 22:57 UTC+0100 jfl (mafact) + * source/rdd/rddcpy.c + * added missing explicit cast needed by VC++ + 2000-11-24 12:50 UTC+0800 Ron Pinkas * include/hbset.h * include/set.ch diff --git a/harbour/source/rdd/rddcpy.c b/harbour/source/rdd/rddcpy.c index f844b34555..e13fc54281 100644 --- a/harbour/source/rdd/rddcpy.c +++ b/harbour/source/rdd/rddcpy.c @@ -33,7 +33,7 @@ * */ -// as we are in C, the code is upside down, +// as we are in C, the code is upside down, // find __SBAPP & __DBCOPY at the bottom // create a new AREANODE and open it's Area @@ -89,7 +89,7 @@ static BOOL IsFieldIn( char * fieldName, PHB_ITEM pFields ) return FALSE; } -// move the Field Data between areas by name +// move the Field Data between areas by name static void rddMoveFields( AREAP pAreaFrom, AREAP pAreaTo, PHB_ITEM pFields ) { USHORT i; @@ -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 @@ -173,7 +173,7 @@ static ERRCODE rddMoveRecords( char *cAreaFrom, char *cAreaTo, PHB_ITEM pFields, // move those records assuming we are positioned on one. while( keepGoing ) { - keepGoing = FALSE; + keepGoing = FALSE; if( !pAreaFrom->fEof ) // until eof or an evaluation failed { if( pWhile ) @@ -208,7 +208,7 @@ static ERRCODE rddMoveRecords( char *cAreaFrom, char *cAreaTo, PHB_ITEM pFields, SELF_RELEASE( ( AREAP ) pAreaRelease->pArea ); hb_xfree( pAreaRelease ); -/* should the following be released? +/* should the following be released? if ( pFields ) hb_itemRelease( pFields ); if ( pFor )