diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 17d8f3f4fe..2972f14ec0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,9 @@ +2000-10-13 11:28 GMT+3 Alexander Kresin + * source/rdd/dbfcdx/dbfcdx1.c + * source/rdd/dbcmd.c + * source/include/hbrddcdx.h + * fixed some warnings, added HB_TRACE_... + 2000-10-12 23:50 UTC-0400 David G. Holm * include/hbver.h % Bumped the revision code to "h" and the date to 2000-10-12 diff --git a/harbour/include/hbrddcdx.h b/harbour/include/hbrddcdx.h index 01122c8744..2af2830c41 100644 --- a/harbour/include/hbrddcdx.h +++ b/harbour/include/hbrddcdx.h @@ -166,7 +166,7 @@ typedef struct _CDXINDEX LONG NextAvail; // review this... LPCDXTAG TagList; - struct _INDEXINFO * pNext; /* The next index in the list */ + struct _CDXINDEX * pNext; /* The next index in the list */ } CDXINDEX; typedef CDXINDEX * LPCDXINDEX; diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index e2f8f7ada2..c3f082f208 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -522,7 +522,7 @@ static void hb_cdxWriteMemo( CDXAREAP pArea, ULONG ulBlock, PHB_ITEM pItem, ULON BOOL bWriteBlocks; HB_TRACE(HB_TR_DEBUG, ("hb_cdxWriteMemo(%p, %lu, %p, %lu, %p, %hu)", pArea, ulBlock, - pItem, ulLen, ulNewBlock, uiType)); + pItem, ulLen, ulStoredBlock, uiType)); uiBloksRequired = ( USHORT ) ( ulLen + sizeof( MEMOBLOCK ) + pArea->uiMemoBlockSize - 1 ) / pArea->uiMemoBlockSize; @@ -1228,10 +1228,7 @@ ERRCODE hb_cdxOpenMemFile( CDXAREAP pArea, LPDBOPENINFO pOpenInfo ) bRetry = FALSE; } while( bRetry ); if( pError ) - { hb_errRelease( pError ); - pError = NULL; - } if( pArea->hMemoFile == FS_ERROR ) return FAILURE; @@ -3977,7 +3974,7 @@ static ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip ) //BOOL fTop; /* TRUE if "top" */ //BOOL fBottom; /* TRUE if "bottom" */ SUPER_GOBOTTOM( ( AREAP ) pArea ); - SUPER_SKIPRAW( pArea, 1 ); + SUPER_SKIPRAW( ( AREAP ) pArea, 1 ); pArea->fEof = pTag->TagEOF = TRUE; } }