From c3c1f244d400538ddd5d10018bd8737b59325e12 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 11 Jan 2011 23:11:53 +0000 Subject: [PATCH] 2011-01-12 00:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbexpat/hbexpat.c * contrib/hbcurl/hbcurl.c * contrib/hbssl/ssl.c * contrib/hbssl/pem.c * contrib/hbqt/qtcore/hbqt_hbqslots.cpp * Changed to use hb_evalBlock()/hb_evalBlock1()/hb_evalBlock0() instead of hb_vmEvalBlockV(). * src/vm/eval.c ! Minor in comment. * contrib/hbqt/qtcore/hbqt_hbqevents.cpp * Formatting. --- harbour/ChangeLog | 15 ++++++++ harbour/contrib/hbcurl/hbcurl.c | 4 +-- harbour/contrib/hbexpat/hbexpat.c | 34 +++++++++++-------- .../contrib/hbqt/qtcore/hbqt_hbqevents.cpp | 4 +-- harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp | 2 +- harbour/contrib/hbssl/pem.c | 7 ++-- harbour/contrib/hbssl/ssl.c | 2 +- harbour/src/vm/eval.c | 2 +- 8 files changed, 45 insertions(+), 25 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 784dbd6390..2ea331539c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-12 00:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbexpat/hbexpat.c + * contrib/hbcurl/hbcurl.c + * contrib/hbssl/ssl.c + * contrib/hbssl/pem.c + * contrib/hbqt/qtcore/hbqt_hbqslots.cpp + * Changed to use hb_evalBlock()/hb_evalBlock1()/hb_evalBlock0() + instead of hb_vmEvalBlockV(). + + * src/vm/eval.c + ! Minor in comment. + + * contrib/hbqt/qtcore/hbqt_hbqevents.cpp + * Formatting. + 2011-01-11 23:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmxml/tests/reminder.prg * contrib/hbmxml/tests/test.prg diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index ccb24a03d0..e565e0f6d7 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -390,12 +390,12 @@ static int hb_curl_progress_callback( void * Cargo, double dltotal, double dlnow PHB_ITEM p1 = hb_itemPutND( NULL, ulnow > 0 ? ulnow : dlnow ); PHB_ITEM p2 = hb_itemPutND( NULL, ultotal > 0 ? ultotal : dltotal ); - HB_BOOL bResult = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) Cargo, 2, p1, p2 ) ); + hb_evalBlock( ( PHB_ITEM ) Cargo, p1, p2, NULL ); hb_itemRelease( p1 ); hb_itemRelease( p2 ); - if( bResult ) + if( hb_parl( -1 ) ) return 1; /* Abort */ hb_vmRequestRestore(); diff --git a/harbour/contrib/hbexpat/hbexpat.c b/harbour/contrib/hbexpat/hbexpat.c index 313aeefdcf..48142169b4 100644 --- a/harbour/contrib/hbexpat/hbexpat.c +++ b/harbour/contrib/hbexpat/hbexpat.c @@ -162,7 +162,7 @@ static void hb_expat_hnd_void( int nHnd, void * userdata ) { PHB_ITEM pUserData = hb_itemNew( hb_expat->pVar[ _VAR_xUserData ] ); - hb_vmEvalBlockV( hb_expat->pVar[ nHnd ], 1, pUserData ); + hb_evalBlock1( hb_expat->pVar[ nHnd ], pUserData ); hb_itemRelease( pUserData ); @@ -182,7 +182,7 @@ static void hb_expat_hnd_C( int nHnd, void * userdata, const XML_Char * par1 ) PHB_ITEM pUserData = hb_itemNew( hb_expat->pVar[ _VAR_xUserData ] ); PHB_ITEM pPar1 = hb_itemPutStrUTF8( NULL, par1 ); - hb_vmEvalBlockV( hb_expat->pVar[ nHnd ], 2, pUserData, pPar1 ); + hb_evalBlock( hb_expat->pVar[ nHnd ], pUserData, pPar1, NULL ); hb_itemRelease( pPar1 ); hb_itemRelease( pUserData ); @@ -203,7 +203,7 @@ static void hb_expat_hnd_CLen( int nHnd, void * userdata, const XML_Char * par1, PHB_ITEM pUserData = hb_itemNew( hb_expat->pVar[ _VAR_xUserData ] ); PHB_ITEM pPar1 = hb_itemPutStrLenUTF8( NULL, par1, par1len ); - hb_vmEvalBlockV( hb_expat->pVar[ nHnd ], 2, pUserData, pPar1 ); + hb_evalBlock( hb_expat->pVar[ nHnd ], pUserData, pPar1, NULL ); hb_itemRelease( pPar1 ); hb_itemRelease( pUserData ); @@ -253,7 +253,7 @@ static void XMLCALL hb_expat_StartElementHandler( void * userdata, const XML_Cha else pAttr = hb_itemArrayNew( 0 ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bStartElementHandler ], 3, pUserData, pElement, pAttr ); + hb_evalBlock( hb_expat->pVar[ _VAR_bStartElementHandler ], pUserData, pElement, pAttr, NULL ); hb_itemRelease( pAttr ); hb_itemRelease( pElement ); @@ -286,7 +286,7 @@ static void XMLCALL hb_expat_ProcessingInstructionHandler( void * userdata, cons PHB_ITEM pTarget = hb_itemPutStrUTF8( NULL, target ); PHB_ITEM pData = hb_itemPutStrUTF8( NULL, data ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bProcessingInstructionHandler ], 3, pUserData, pTarget, pData ); + hb_evalBlock( hb_expat->pVar[ _VAR_bProcessingInstructionHandler ], pUserData, pTarget, pData, NULL ); hb_itemRelease( pData ); hb_itemRelease( pTarget ); @@ -336,7 +336,7 @@ static void XMLCALL hb_expat_SkippedEntityHandler( void * userdata, PHB_ITEM pPar1 = hb_itemPutStrUTF8( NULL, entityName ); PHB_ITEM pPar2 = hb_itemPutL( NULL, is_parameter_entity ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bSkippedEntityHandler ], 3, pUserData, pPar1, pPar2 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bSkippedEntityHandler ], pUserData, pPar1, pPar2, NULL ); hb_itemRelease( pPar2 ); hb_itemRelease( pPar1 ); @@ -362,7 +362,9 @@ static int XMLCALL hb_expat_UnknownEncodingHandler( void * userdata, PHB_ITEM pPar1 = hb_itemPutStrUTF8( NULL, name ); PHB_ITEM pPar2 = hb_itemArrayNew( HB_SIZEOFARRAY( info->map ) ); - iResult = hb_itemGetNI( hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bUnknownEncodingHandler ], 3, pEncData, pPar1, pPar2 ) ); + hb_evalBlock( hb_expat->pVar[ _VAR_bUnknownEncodingHandler ], pEncData, pPar1, pPar2, NULL ); + + iResult = hb_parni( -1 ); if( iResult == XML_STATUS_OK ) { @@ -402,7 +404,7 @@ static void XMLCALL hb_expat_StartNamespaceDeclHandler( void * userdata, PHB_ITEM pPar1 = hb_itemPutStrUTF8( NULL, prefix ); PHB_ITEM pPar2 = hb_itemPutStrUTF8( NULL, uri ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bStartNamespaceDeclHandler ], 3, pUserData, pPar1, pPar2 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bStartNamespaceDeclHandler ], pUserData, pPar1, pPar2, NULL ); hb_itemRelease( pPar2 ); hb_itemRelease( pPar1 ); @@ -434,7 +436,7 @@ static void XMLCALL hb_expat_XmlDeclHandler( void * userdata, PHB_ITEM pPar2 = encoding ? hb_itemPutStrUTF8( NULL, encoding ) : hb_itemNew( NULL ); PHB_ITEM pPar3 = hb_itemPutNI( NULL, standalone ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bXmlDeclHandler ], 4, pUserData, pPar1, pPar2, pPar3 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bXmlDeclHandler ], pUserData, pPar1, pPar2, pPar3, NULL ); hb_itemRelease( pPar3 ); hb_itemRelease( pPar2 ); @@ -464,7 +466,7 @@ static void XMLCALL hb_expat_StartDoctypeDeclHandler( void * userdata, PHB_ITEM pPar3 = pubid ? hb_itemPutStrUTF8( NULL, pubid ) : hb_itemNew( NULL ); PHB_ITEM pPar4 = hb_itemPutL( NULL, has_internal_subset ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bStartDoctypeDeclHandler ], 5, pUserData, pPar1, pPar2, pPar3, pPar4 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bStartDoctypeDeclHandler ], pUserData, pPar1, pPar2, pPar3, pPar4, NULL ); hb_itemRelease( pPar4 ); hb_itemRelease( pPar3 ); @@ -502,7 +504,7 @@ static void XMLCALL hb_expat_AttlistDeclHandler( void * userdata, PHB_ITEM pPar4 = dflt ? hb_itemPutStrUTF8( NULL, dflt ) : hb_itemNew( NULL ); PHB_ITEM pPar5 = hb_itemPutL( NULL, isrequired ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bAttlistDeclHandler ], 6, pUserData, pPar1, pPar2, pPar3, pPar4, pPar5 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bAttlistDeclHandler ], pUserData, pPar1, pPar2, pPar3, pPar4, pPar5, NULL ); hb_itemRelease( pPar5 ); hb_itemRelease( pPar4 ); @@ -541,7 +543,7 @@ static void XMLCALL hb_expat_EntityDeclHandler( void * userdata, PHB_ITEM pPar6 = publicId ? hb_itemPutStrUTF8( NULL, publicId ) : hb_itemNew( NULL ); PHB_ITEM pPar7 = notationName ? hb_itemPutStrUTF8( NULL, notationName ) : hb_itemNew( NULL ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bEntityDeclHandler ], 8, pUserData, pPar1, pPar2, pPar3, pPar4, pPar5, pPar6, pPar7 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bEntityDeclHandler ], pUserData, pPar1, pPar2, pPar3, pPar4, pPar5, pPar6, pPar7, NULL ); hb_itemRelease( pPar7 ); hb_itemRelease( pPar6 ); @@ -578,7 +580,7 @@ static void XMLCALL hb_expat_UnparsedEntityDeclHandler( void * userdata, PHB_ITEM pPar4 = hb_itemPutStrUTF8( NULL, publicId ); PHB_ITEM pPar5 = hb_itemPutStrUTF8( NULL, notationName ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bUnparsedEntityDeclHandler ], 6, pUserData, pPar1, pPar2, pPar3, pPar4, pPar5 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bUnparsedEntityDeclHandler ], pUserData, pPar1, pPar2, pPar3, pPar4, pPar5, NULL ); hb_itemRelease( pPar5 ); hb_itemRelease( pPar4 ); @@ -611,7 +613,7 @@ static void XMLCALL hb_expat_NotationDeclHandler( void * userdata, PHB_ITEM pPar3 = systemId ? hb_itemPutStrUTF8( NULL, systemId ) : hb_itemNew( NULL ); PHB_ITEM pPar4 = publicId ? hb_itemPutStrUTF8( NULL, publicId ) : hb_itemNew( NULL ); - hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bNotationDeclHandler ], 5, pUserData, pPar1, pPar2, pPar3, pPar4 ); + hb_evalBlock( hb_expat->pVar[ _VAR_bNotationDeclHandler ], pUserData, pPar1, pPar2, pPar3, pPar4, NULL ); hb_itemRelease( pPar4 ); hb_itemRelease( pPar3 ); @@ -636,7 +638,9 @@ static int XMLCALL hb_expat_NotStandaloneHandler( void * userdata ) { PHB_ITEM pUserData = hb_itemNew( hb_expat->pVar[ _VAR_xUserData ] ); - iResult = hb_itemGetNI( hb_vmEvalBlockV( hb_expat->pVar[ _VAR_bNotStandaloneHandler ], 1, pUserData ) ); + hb_evalBlock1( hb_expat->pVar[ _VAR_bNotStandaloneHandler ], pUserData ); + + iResult = hb_parni( -1 ); hb_itemRelease( pUserData ); diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp index 50c2377025..0e292d6619 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp @@ -170,9 +170,9 @@ bool HBQEvents::eventFilter( QObject * object, QEvent * event ) if( found <= listBlock.size() && hb_vmRequestReenter() ) { - PHB_ITEM pEvent = hb_itemPutPtr( NULL, event ); + PHB_ITEM pEvent = hb_itemPutPtr( NULL, event ); ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 1, pEvent ) ); - hb_itemRelease( pEvent ); + hb_itemRelease( pEvent ); hb_vmRequestRestore(); if( eventtype == QEvent::Close ) diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp index 74f5ffd0a1..bf1cc8641f 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp @@ -170,7 +170,7 @@ int HBQSlots::qt_metacall( QMetaObject::Call c, int id, void ** arguments ) if( i > 0 && i <= this->listBlock.size() && hb_vmRequestReenter() ) { if( parameterCount == 0 ) - hb_vmEvalBlockV( this->listBlock.at( i - 1 ), 0 ); + hb_evalBlock0( this->listBlock.at( i - 1 ) ); else { int paramId = s_argCombinations.indexOf( paramString ); diff --git a/harbour/contrib/hbssl/pem.c b/harbour/contrib/hbssl/pem.c index 1aecda9466..0dbd02ba5d 100644 --- a/harbour/contrib/hbssl/pem.c +++ b/harbour/contrib/hbssl/pem.c @@ -67,20 +67,21 @@ static int hb_ssl_pem_password_cb( char * buf, int size, int rwflag, void * user if( size > 0 && userdata && hb_vmRequestReenter() ) { PHB_ITEM p = hb_itemPutL( NULL, rwflag ); - PHB_ITEM r = hb_vmEvalBlockV( ( PHB_ITEM ) userdata, 1, p ); + + hb_evalBlock1( ( PHB_ITEM ) userdata, p ); hb_itemRelease( p ); buf[ 0 ] = '\0'; - retsize = ( int ) hb_itemGetCLen( r ); + retsize = ( int ) hb_parclen( -1 ); if( retsize > 0 ) { if( retsize > size ) retsize = size; - memcpy( buf, hb_itemGetCPtr( r ), retsize ); + memcpy( buf, hb_parc( -1 ), retsize ); } hb_vmRequestRestore(); diff --git a/harbour/contrib/hbssl/ssl.c b/harbour/contrib/hbssl/ssl.c index 1a80fea9e4..13c66f53b6 100644 --- a/harbour/contrib/hbssl/ssl.c +++ b/harbour/contrib/hbssl/ssl.c @@ -1492,7 +1492,7 @@ static void hb_ssl_msg_callback( int write_p, int version, int content_type, con PHB_ITEM p3 = hb_itemPutNI( NULL, content_type ); PHB_ITEM p4 = hb_itemPutCL( NULL, ( const char * ) buf, ( HB_SIZE ) len ); - hb_vmEvalBlockV( ( PHB_ITEM ) userdata, 4, p1, p2, p3, p4 ); + hb_evalBlock( ( PHB_ITEM ) userdata, p1, p2, p3, p4, NULL ); hb_itemRelease( p4 ); hb_itemRelease( p3 ); diff --git a/harbour/src/vm/eval.c b/harbour/src/vm/eval.c index 593c2a2f13..8b942a086e 100644 --- a/harbour/src/vm/eval.c +++ b/harbour/src/vm/eval.c @@ -307,7 +307,7 @@ PHB_ITEM hb_itemDoC( const char * szFunc, HB_ULONG ulPCount, ... ) /* * Notice that these two functions place the result at hb_stackReturnItem(), - * that you may access its value using a _par...( -1 ). + * that you may access its value using a hb_par...( -1 ). */ /* undocumented Clipper _cEval0() */