fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2001-11-30 22:05 GMT+1 JFL (mafact) <jfl@mafact.com>

Browse Source
This commit is contained in:
Jean-Francois Lefebvre
2001-11-30 21:05:10 +00:00
parent 1201482103
commit fe49028b8c
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -1,3 +1,9 @@
2001-11-30 22:05 GMT+1 JFL (mafact) <jfl@mafact.com>
* harbour/source/vm/arrays.c
* Corrected an error I added while creating null item when not needed
* removed unneded itemrelease at the end of treatment
2001-11-30 00:10 GMT+1 JFL (mafact) <jfl@mafact.com>
* harbour/source/vm/arrays.c
* simplified hb_arrayClone() while keeping logic

20
harbour/source/vm/arrays.c
View File

@@ -64,6 +64,9 @@
* hb_arrayFromStack()
* hb_arrayFromParams()
*
* Copyright 2001 jfl (mafact) jfl@mafact.com>
* hb_arrayClone() fixed againt unneded itemrelease
*
* See doc/license.txt for licensing terms.
*
*/
@@ -724,8 +727,6 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray, PHB_NESTED_CLONED pClonedList )
HB_TRACE(HB_TR_DEBUG, ("hb_arrayClone(%p, %p)", pSrcArray, pClonedList));
pDstArray = hb_itemNew( NULL );
if( HB_IS_ARRAY( pSrcArray ) )
{
PHB_BASEARRAY pSrcBaseArray = pSrcArray->item.asArray.value;
@@ -735,6 +736,7 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray, PHB_NESTED_CLONED pClonedList )
PHB_NESTED_CLONED pCloned;
BOOL bTop;
pDstArray = hb_itemNew( NULL );
hb_arrayNew( pDstArray, ulSrcLen );
if( pClonedList == NULL )
@@ -819,8 +821,11 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray, PHB_NESTED_CLONED pClonedList )
{
pClonedList = pClonedList->pNext;
if( pCloned->pDest != pDstArray )
hb_itemRelease( pCloned->pDest );
/* Not needed as we need to keep all the cloned array */
/* including all subarray */
/* if( pCloned->pDest != pDstArray ) */
/* hb_itemRelease( pCloned->pDest ); */
hb_xfree( pCloned );
@@ -829,9 +834,14 @@ PHB_ITEM hb_arrayClone( PHB_ITEM pSrcArray, PHB_NESTED_CLONED pClonedList )
}
return pDstArray;
}
else
{
return hb_itemNew( NULL );
}
return pDstArray;
}