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

2009-06-23 19:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbapi.h
  * include/hbapiitm.h
  * source/vm/itemapi.c
  * source/vm/arrays.c
  * source/vm/extend.c
    * Clean alternative for: 2009-06-23 18:15 UTC+0200
      (now change is local to extend.c)
      Thanks Przemek.
This commit is contained in:
Viktor Szakats
2009-06-23 17:23:22 +00:00
parent f1052fb187
commit f5904ca848
6 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-23 19:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* include/hbapi.h
* include/hbapiitm.h
* source/vm/itemapi.c
* source/vm/arrays.c
* source/vm/extend.c
* Clean alternative for: 2009-06-23 18:15 UTC+0200
(now change is local to extend.c)
Thanks Przemek.
2009-06-23 19:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
- examples/superlib/hbsuper.hbp
+ examples/superlib/superlib.hbc

1
harbour/include/hbapi.h
View File

@@ -778,7 +778,6 @@ extern HB_EXPORT PHB_ITEM hb_arrayGetItemPtr( PHB_ITEM pArray, ULONG ulIndex );
extern HB_EXPORT ULONG hb_arrayCopyC( PHB_ITEM pArray, ULONG ulIndex, char * szBuffer, ULONG ulLen ); /* copy a string into an array item */
extern HB_EXPORT char * hb_arrayGetC( PHB_ITEM pArray, ULONG ulIndex ); /* retrieves the string contained on an array element */
extern HB_EXPORT char * hb_arrayGetCPtr( PHB_ITEM pArray, ULONG ulIndex ); /* retrieves the string pointer on an array element */
extern HB_EXPORT char * hb_arrayGetCPtrNULL( PHB_ITEM pArray, ULONG ulIndex ); /* retrieves the string pointer on an array element. Returns NULL on error. */
extern HB_EXPORT ULONG hb_arrayGetCLen( PHB_ITEM pArray, ULONG ulIndex ); /* retrieves the string length contained on an array element */
extern HB_EXPORT void * hb_arrayGetPtr( PHB_ITEM pArray, ULONG ulIndex ); /* retrieves the pointer contained on an array element */
extern HB_EXPORT void * hb_arrayGetPtrGC( PHB_ITEM pArray, ULONG ulIndex, HB_GARBAGE_FUNC_PTR pFunc ); /* retrieves the GC pointer contained on an array element */

1
harbour/include/hbapiitm.h
View File

@@ -86,7 +86,6 @@ extern HB_EXPORT ULONG hb_itemCopyC ( PHB_ITEM pItem, char * szBuffer,
extern HB_EXPORT BOOL hb_itemFreeC ( char * szText );
extern HB_EXPORT char * hb_itemGetC ( PHB_ITEM pItem );
extern HB_EXPORT char * hb_itemGetCPtr ( PHB_ITEM pItem );
extern HB_EXPORT char * hb_itemGetCPtrNULL( PHB_ITEM pItem );
extern HB_EXPORT ULONG hb_itemGetCLen ( PHB_ITEM pItem );
extern HB_EXPORT char * hb_itemGetDS ( PHB_ITEM pItem, char * szDate );
extern HB_EXPORT char * hb_itemGetTS ( PHB_ITEM pItem, char * szDateTime );

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

@@ -622,19 +622,6 @@ char * hb_arrayGetCPtr( PHB_ITEM pArray, ULONG ulIndex )
return ( char * ) "";
}
/* Variant of hb_arrayGetCPtr() to provide Cl*pper compatibility.
[vszakats] */
char * hb_arrayGetCPtrNULL( PHB_ITEM pArray, ULONG ulIndex )
{
HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetCPtr(%p, %lu)", pArray, ulIndex));
if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen )
return hb_itemGetCPtrNULL( pArray->item.asArray.value->pItems + ulIndex - 1 );
else
return ( char * ) NULL;
}
ULONG hb_arrayGetCLen( PHB_ITEM pArray, ULONG ulIndex )
{
HB_TRACE(HB_TR_DEBUG, ("hb_arrayGetCLen(%p, %lu)", pArray, ulIndex));

3
harbour/source/vm/extend.c
View File

@@ -634,7 +634,8 @@ char * hb_parvc( int iParam, ... )
ulArrayIndex = va_arg( va, ULONG );
va_end( va );
return hb_arrayGetCPtrNULL( pItem, ulArrayIndex );
pItem = hb_arrayGetItemPtr( pItem, ulArrayIndex );
return pItem && HB_IS_STRING( pItem ) ? hb_itemGetCPtr( pItem ) : NULL;
}
}

13
harbour/source/vm/itemapi.c
View File

@@ -465,19 +465,6 @@ char * hb_itemGetCPtr( PHB_ITEM pItem )
return ( char * ) "";
}
/* Variant of hb_itemGetCPtr() to provide Cl*pper compatibility.
[vszakats] */
char * hb_itemGetCPtrNULL( PHB_ITEM pItem )
{
HB_TRACE(HB_TR_DEBUG, ("hb_itemGetCPtrNULL(%p)", pItem));
if( pItem && HB_IS_STRING( pItem ) )
return pItem->item.asString.value;
else
return ( char * ) NULL;
}
ULONG hb_itemGetCLen( PHB_ITEM pItem )
{
HB_TRACE(HB_TR_DEBUG, ("hb_itemGetCLen(%p)", pItem));