From 6723c119b5961efb4e3623418ea0d5ddc075dfce Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 10 Jun 2008 09:13:33 +0000 Subject: [PATCH] 2008-06-10 11:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtwvt/gtwvt.c ! Fixed maximized window size. * contrib/hbw32/dllcall.c * Further cleanup. ! MessageBox()es converted to RTE calls. * contrib/hbcurl/hbcurl.c * contrib/rddads/ads1.c * contrib/rddads/adsfunc.c * source/rdd/dbcmd.c * source/rdd/dbcmd53.c * source/rdd/dbcmdx.c * source/rdd/dbsql.c * source/rdd/wafunc.c * source/rdd/workarea.c * source/rtl/abs.c * source/rtl/at.c * source/rtl/cdpapi.c * source/rtl/chrasc.c * source/rtl/copyfile.c * source/rtl/datec.c * source/rtl/dateshb.c * source/rtl/do.c * source/rtl/gtfunc.c * source/rtl/hbadler.c * source/rtl/hbbit.c * source/rtl/hbcrc.c * source/rtl/hbhex.c * source/rtl/hbinet.c * source/rtl/hbregex.c * source/rtl/hbregexc.c * source/rtl/hbrunfun.c * source/rtl/hbtoken.c * source/rtl/hbzlib.c * source/rtl/left.c * source/rtl/len.c * source/rtl/math.c * source/rtl/minmax.c * source/rtl/philes.c * source/rtl/philesx.c * source/rtl/replic.c * source/rtl/round.c * source/rtl/run.c * source/rtl/set.c * source/rtl/space.c * source/rtl/str.c * source/rtl/strcase.c * source/rtl/strpeek.c * source/rtl/strtran.c * source/rtl/strzero.c * source/rtl/substr.c * source/rtl/transfrm.c * source/rtl/trim.c * source/rtl/type.c * source/rtl/val.c * source/rtl/valtype.c * source/rtl/word.c * source/vm/arrayshb.c * source/vm/classes.c * source/vm/debug.c * source/vm/eval.c * source/vm/evalhb.c * source/vm/hashfunc.c * source/vm/memvars.c * source/vm/runner.c * &hb_errFuncName -> HB_ERR_FUNCNAME % Using HB_ERR_FUNCNAME wherever possible. --- harbour/ChangeLog | 70 ++++++++++ harbour/contrib/hbcurl/hbcurl.c | 36 ++--- harbour/contrib/hbw32/dllcall.c | 230 ++++++++++++------------------- harbour/contrib/rddads/ads1.c | 8 +- harbour/contrib/rddads/adsfunc.c | 106 +++++++------- harbour/source/rdd/dbcmd.c | 128 ++++++++--------- harbour/source/rdd/dbcmd53.c | 52 +++---- harbour/source/rdd/dbcmdx.c | 6 +- harbour/source/rdd/dbsql.c | 4 +- harbour/source/rdd/wafunc.c | 10 +- harbour/source/rdd/workarea.c | 4 +- harbour/source/rtl/abs.c | 2 +- harbour/source/rtl/at.c | 4 +- harbour/source/rtl/cdpapi.c | 18 +-- harbour/source/rtl/chrasc.c | 6 +- harbour/source/rtl/copyfile.c | 2 +- harbour/source/rtl/datec.c | 5 +- harbour/source/rtl/dateshb.c | 14 +- harbour/source/rtl/do.c | 2 +- harbour/source/rtl/gtfunc.c | 8 +- harbour/source/rtl/gtwvt/gtwvt.c | 107 +++++++------- harbour/source/rtl/hbadler.c | 2 +- harbour/source/rtl/hbbit.c | 2 +- harbour/source/rtl/hbcrc.c | 8 +- harbour/source/rtl/hbhex.c | 8 +- harbour/source/rtl/hbinet.c | 62 ++++----- harbour/source/rtl/hbregex.c | 6 +- harbour/source/rtl/hbregexc.c | 2 +- harbour/source/rtl/hbrunfun.c | 2 +- harbour/source/rtl/hbtoken.c | 2 +- harbour/source/rtl/hbzlib.c | 28 ++-- harbour/source/rtl/left.c | 3 +- harbour/source/rtl/len.c | 2 +- harbour/source/rtl/math.c | 8 +- harbour/source/rtl/minmax.c | 5 +- harbour/source/rtl/philes.c | 2 +- harbour/source/rtl/philesx.c | 2 +- harbour/source/rtl/replic.c | 5 +- harbour/source/rtl/round.c | 4 +- harbour/source/rtl/run.c | 2 +- harbour/source/rtl/set.c | 36 ++--- harbour/source/rtl/space.c | 4 +- harbour/source/rtl/str.c | 2 +- harbour/source/rtl/strcase.c | 4 +- harbour/source/rtl/strpeek.c | 4 +- harbour/source/rtl/strtran.c | 4 +- harbour/source/rtl/strzero.c | 2 +- harbour/source/rtl/substr.c | 4 +- harbour/source/rtl/transfrm.c | 2 +- harbour/source/rtl/trim.c | 6 +- harbour/source/rtl/type.c | 3 +- harbour/source/rtl/val.c | 2 +- harbour/source/rtl/valtype.c | 2 +- harbour/source/rtl/word.c | 2 +- harbour/source/vm/arrayshb.c | 12 +- harbour/source/vm/classes.c | 26 ++-- harbour/source/vm/debug.c | 2 +- harbour/source/vm/eval.c | 5 +- harbour/source/vm/evalhb.c | 3 +- harbour/source/vm/hashfunc.c | 48 +++---- harbour/source/vm/memvars.c | 4 +- harbour/source/vm/runner.c | 20 +-- 62 files changed, 586 insertions(+), 588 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index be81888162..b5e8b6e1f9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,76 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-10 11:10 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/gtwvt/gtwvt.c + ! Fixed maximized window size. + + * contrib/hbw32/dllcall.c + * Further cleanup. + ! MessageBox()es converted to RTE calls. + + * contrib/hbcurl/hbcurl.c + * contrib/rddads/ads1.c + * contrib/rddads/adsfunc.c + * source/rdd/dbcmd.c + * source/rdd/dbcmd53.c + * source/rdd/dbcmdx.c + * source/rdd/dbsql.c + * source/rdd/wafunc.c + * source/rdd/workarea.c + * source/rtl/abs.c + * source/rtl/at.c + * source/rtl/cdpapi.c + * source/rtl/chrasc.c + * source/rtl/copyfile.c + * source/rtl/datec.c + * source/rtl/dateshb.c + * source/rtl/do.c + * source/rtl/gtfunc.c + * source/rtl/hbadler.c + * source/rtl/hbbit.c + * source/rtl/hbcrc.c + * source/rtl/hbhex.c + * source/rtl/hbinet.c + * source/rtl/hbregex.c + * source/rtl/hbregexc.c + * source/rtl/hbrunfun.c + * source/rtl/hbtoken.c + * source/rtl/hbzlib.c + * source/rtl/left.c + * source/rtl/len.c + * source/rtl/math.c + * source/rtl/minmax.c + * source/rtl/philes.c + * source/rtl/philesx.c + * source/rtl/replic.c + * source/rtl/round.c + * source/rtl/run.c + * source/rtl/set.c + * source/rtl/space.c + * source/rtl/str.c + * source/rtl/strcase.c + * source/rtl/strpeek.c + * source/rtl/strtran.c + * source/rtl/strzero.c + * source/rtl/substr.c + * source/rtl/transfrm.c + * source/rtl/trim.c + * source/rtl/type.c + * source/rtl/val.c + * source/rtl/valtype.c + * source/rtl/word.c + * source/vm/arrayshb.c + * source/vm/classes.c + * source/vm/debug.c + * source/vm/eval.c + * source/vm/evalhb.c + * source/vm/hashfunc.c + * source/vm/memvars.c + * source/vm/runner.c + * &hb_errFuncName -> HB_ERR_FUNCNAME + % Using HB_ERR_FUNCNAME wherever possible. + 2008-06-09 14:48 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com * harbour/source/rtl/gtwvt/gtwvt.c ! Fixed for selection in the last row and column. diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index a70bd1178a..47bbcac45d 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -494,7 +494,7 @@ HB_FUNC( CURL_EASY_DUPLICATE ) if( PHB_CURL_is( 1 ) ) PHB_CURL_ret( PHB_CURL_par( 1 ) ); else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( CURL_EASY_CLEANUP ) @@ -513,7 +513,7 @@ HB_FUNC( CURL_EASY_CLEANUP ) } } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #if LIBCURL_VERSION_NUM >= 0x071201 @@ -528,7 +528,7 @@ HB_FUNC( CURL_EASY_RESET ) PHB_CURL_free( hb_curl, FALSE ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif @@ -544,7 +544,7 @@ HB_FUNC( CURL_EASY_PAUSE ) hb_retnl( hb_curl ? ( long ) curl_easy_pause( hb_curl->curl, hb_parni( 2 ) ) : HB_CURLE_ERROR ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif @@ -558,7 +558,7 @@ HB_FUNC( CURL_EASY_PERFORM ) hb_retnl( hb_curl ? ( long ) curl_easy_perform( hb_curl->curl ) : HB_CURLE_ERROR ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #if LIBCURL_VERSION_NUM >= 0x071802 @@ -583,7 +583,7 @@ HB_FUNC( CURL_EASY_SEND ) hb_retnl( ( long ) res ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* NOTE: curl_easy_recv( curl, @cBuffer ) -> nResult */ @@ -613,7 +613,7 @@ HB_FUNC( CURL_EASY_RECV ) hb_retnl( ( long ) res ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif @@ -1314,7 +1314,7 @@ HB_FUNC( CURL_EASY_SETOPT ) hb_retnl( ( long ) res ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* Harbour extension. */ @@ -1330,7 +1330,7 @@ HB_FUNC( CURL_EASY_DL_BUFF_GET ) hb_retc_null(); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #define HB_CURL_INFO_TYPE_INVALID 0 @@ -1553,7 +1553,7 @@ HB_FUNC( CURL_EASY_GETINFO ) hb_stornl( ( long ) res, 3 ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #if LIBCURL_VERSION_NUM >= 0x071504 @@ -1574,7 +1574,7 @@ HB_FUNC( CURL_EASY_ESCAPE ) hb_retc_null(); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( CURL_EASY_UNESCAPE ) @@ -1594,7 +1594,7 @@ HB_FUNC( CURL_EASY_UNESCAPE ) hb_retc_null(); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif @@ -1614,7 +1614,7 @@ HB_FUNC( CURL_ESCAPE ) curl_free( buffer ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* NOTE: Obsolete, superceded by curl_easy_unescape() */ @@ -1627,7 +1627,7 @@ HB_FUNC( CURL_UNESCAPE ) curl_free( buffer ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif @@ -1686,7 +1686,7 @@ HB_FUNC( CURL_EASY_STRERROR ) if( ISNUM( 1 ) ) hb_retc( curl_easy_strerror( ( CURLcode ) hb_parnl( 1 ) ) ); else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( CURL_SHARE_STRERROR ) @@ -1694,7 +1694,7 @@ HB_FUNC( CURL_SHARE_STRERROR ) if( ISNUM( 1 ) ) hb_retc( curl_share_strerror( ( CURLSHcode ) hb_parnl( 1 ) ) ); else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( CURL_MULTI_STRERROR ) @@ -1702,7 +1702,7 @@ HB_FUNC( CURL_MULTI_STRERROR ) if( ISNUM( 1 ) ) hb_retc( curl_multi_strerror( ( CURLMcode ) hb_parnl( 1 ) ) ); else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif @@ -1713,5 +1713,5 @@ HB_FUNC( CURL_GETDATE ) if( ISCHAR( 1 ) ) hb_retnint( ( HB_LONG ) curl_getdate( hb_parc( 1 ), NULL ) ); else - hb_errRT_BASE( EG_ARG, 2010, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/contrib/hbw32/dllcall.c b/harbour/contrib/hbw32/dllcall.c index 9e9bfbd743..ed76aafa18 100644 --- a/harbour/contrib/hbw32/dllcall.c +++ b/harbour/contrib/hbw32/dllcall.c @@ -64,15 +64,14 @@ * */ -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0400 /* QUESTION: Do we need this? */ #define HB_OS_WIN_32_USED -#include "hbapi.h" -#include "hbstack.h" #include "hbvm.h" +#include "hbapi.h" +#include "hbapierr.h" #include "hbapiitm.h" -#include "hbapicls.h" #if !defined( HB_NO_ASM ) && defined( HB_OS_WIN_32 ) @@ -89,6 +88,9 @@ typedef struct _XPP_DLLEXEC #ifdef __XHARBOUR__ +#include "hbstack.h" +#include "hbapicls.h" + static PHB_DYNS pHB_CSTRUCTURE = NULL, pPOINTER, pVALUE, pBUFFER, pDEVALUE; HB_EXTERN_BEGIN @@ -191,7 +193,7 @@ HB_EXPORT char * hb_parcstruct( int iParam, ... ) #define DC_FLAG_ARGPTR 0x00000002 -#define CTYPE_VOID 0 +#define CTYPE_VOID 9 #define CTYPE_CHAR 1 #define CTYPE_UNSIGNED_CHAR -1 #define CTYPE_CHAR_PTR 10 @@ -283,7 +285,7 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, /* Start at the back of the arg ptr, aligned on a DWORD */ nSize = (Parm[nInd].nWidth + 3) / 4 * 4; pArg = (BYTE *) Parm[nInd].pArg + nSize - 4; - dwStSize += (DWORD) nSize; /* Count no of bytes on stack */ + dwStSize += ( DWORD ) nSize; /* Count no of bytes on stack */ nLoops = ( nSize / 4 ) - 1; @@ -293,8 +295,8 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, if( Parm[nInd].dwFlags & DC_FLAG_ARGPTR ) { /* Arg has a ptr to a variable that has the arg */ - dwVal = (DWORD) pArg; /* Get first four bytes */ - pArg -= 4; /* Next part of argument */ + dwVal = ( DWORD ) pArg; /* Get first four bytes */ + pArg -= 4; /* Next part of argument */ } else { @@ -314,9 +316,9 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, { /* Return value isn't passed through registers, memory copy is performed instead. Pass the pointer as hidden arg. */ - dwStSize += 4; /* Add stack size */ - pStack--; /* ESP = ESP - 4 */ - *pStack = (DWORD)pRet; /* SS:[ESP] = pMem */ + dwStSize += 4; /* Add stack size */ + pStack--; /* ESP = ESP - 4 */ + *pStack = ( DWORD ) pRet; /* SS:[ESP] = pMem */ } #if defined( __MINGW32__ ) asm volatile( "\taddl $0x100, %%esp\n" /* Restore to original position */ @@ -354,7 +356,7 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, } #elif defined( __BORLANDC__ ) || defined(__DMC__) _ESP += (0x100 - dwStSize); - _EDX = (DWORD) &lpFunction; + _EDX = ( DWORD ) &lpFunction; __emit__(0xff,0x12); /* call [edx]; */ dwEAX = _EAX; dwEDX = _EDX; @@ -367,21 +369,21 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, if (iFlags & DC_RETVAL_MATH4) { - _EBX = (DWORD) &Res; + _EBX = ( DWORD ) &Res; _EAX = dwEAX; _EDX = dwEDX; __emit__(0xd9,0x1b); /* _asm fnstp float ptr [ebx] */ } else if (iFlags & DC_RETVAL_MATH8) { - _EBX = (DWORD) &Res; + _EBX = ( DWORD ) &Res; _EAX = dwEAX; _EDX = dwEDX; __emit__(0xdd,0x1b); /* _asm fnstp qword ptr [ebx] */ } else if (pRet == NULL) { - _EBX = (DWORD) &Res; + _EBX = ( DWORD ) &Res; _EAX = dwEAX; _EDX = dwEDX; /* _asm mov DWORD PTR [ebx], eax */ @@ -390,7 +392,7 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, } else if (((iFlags & DC_BORLAND) == 0) && (nRetSiz <= 8)) { - _EBX = (DWORD) pRet; + _EBX = ( DWORD ) pRet; _EAX = dwEAX; _EDX = dwEDX; /* _asm mov DWORD PTR [ebx], eax */ @@ -449,12 +451,13 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, */ /* Based originally on CallDLL() from What32 */ -static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int iFirst, int iArgCnt, PXPP_DLLEXEC xec ) +static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, PXPP_DLLEXEC xec, int iParams, int iFirst ) { - int iCnt = 0; + int iCnt; int i; - DYNAPARM Parm[ 15 ]; - RESULT rc; + DYNAPARM Parm[ 15 ]; + RESULT rc; + int iArgCnt; if( xec ) { @@ -464,6 +467,11 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int /* TODO: Params maybe explictly specified in xec! */ } + if( ! lpFunction ) + return; + + iArgCnt = iParams - iFirst + 1; + iFlags &= 0x00ff; /* Calling Convention */ if( iRtype == 0 ) @@ -473,23 +481,25 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int if( iArgCnt > 0 ) { + iCnt = 0; + for( i = iFirst; i <= iParams; i++ ) { switch( hb_parinfo( i ) & ~HB_IT_BYREF ) { case HB_IT_NIL: - Parm[iCnt].nWidth = sizeof( void * ); - Parm[iCnt].dwArg = (DWORD) NULL; + Parm[ iCnt ].nWidth = sizeof( void * ); + Parm[ iCnt ].dwArg = ( DWORD ) NULL; break; case HB_IT_POINTER: - Parm[iCnt].nWidth = sizeof( void * ); - Parm[iCnt].dwArg = (DWORD) hb_parptr( i ); + Parm[ iCnt ].nWidth = sizeof( void * ); + Parm[ iCnt ].dwArg = ( DWORD ) hb_parptr( i ); if( hb_parinfo( i ) & HB_IT_BYREF ) { - Parm[iCnt].pArg = &( Parm[iCnt].dwArg ); - Parm[iCnt].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ + Parm[ iCnt ].pArg = &( Parm[ iCnt ].dwArg ); + Parm[ iCnt ].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ } break; @@ -497,25 +507,25 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int case HB_IT_LONG: case HB_IT_DATE: case HB_IT_LOGICAL: - Parm[iCnt].nWidth = sizeof( DWORD ); - Parm[iCnt].dwArg = (DWORD) hb_parnl( i ); + Parm[ iCnt ].nWidth = sizeof( DWORD ); + Parm[ iCnt ].dwArg = ( DWORD ) hb_parnl( i ); if( hb_parinfo( i ) & HB_IT_BYREF ) { - Parm[iCnt].pArg = &( Parm[iCnt].dwArg ); - Parm[iCnt].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ + Parm[ iCnt ].pArg = &( Parm[ iCnt ].dwArg ); + Parm[ iCnt ].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ } break; case HB_IT_DOUBLE: - Parm[iCnt].nWidth = sizeof( double ); - Parm[iCnt].dArg = hb_parnd( i ); + Parm[ iCnt ].nWidth = sizeof( double ); + Parm[ iCnt ].dArg = hb_parnd( i ); if( hb_parinfo( i ) & HB_IT_BYREF ) { - Parm[iCnt].nWidth = sizeof( void * ); - Parm[iCnt].pArg = &( Parm[iCnt].dArg ); - Parm[iCnt].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ + Parm[ iCnt ].nWidth = sizeof( void * ); + Parm[ iCnt ].pArg = &( Parm[ iCnt ].dArg ); + Parm[ iCnt ].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ } iFlags |= DC_RETVAL_MATH8; @@ -523,27 +533,27 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int case HB_IT_STRING: case HB_IT_MEMO: - Parm[iCnt].nWidth = sizeof( void * ); + Parm[ iCnt ].nWidth = sizeof( void * ); if( hb_parinfo( i ) & HB_IT_BYREF ) { - Parm[iCnt].pArg = hb_xgrab( hb_parclen( i ) ); - memcpy( Parm[iCnt].pArg, hb_parc( i ), hb_parclen( i ) ); + Parm[ iCnt ].pArg = hb_xgrab( hb_parclen( i ) ); + memcpy( Parm[ iCnt ].pArg, hb_parc( i ), hb_parclen( i ) ); } else { - Parm[iCnt].pArg = (void *) hb_parc( i ); + Parm[ iCnt ].pArg = ( void * ) hb_parc( i ); } - Parm[iCnt].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ + Parm[ iCnt ].dwFlags = DC_FLAG_ARGPTR; /* use the pointer */ break; #ifdef __XHARBOUR__ case HB_IT_ARRAY: - if( strncmp( hb_objGetClsName( hb_param(i, HB_IT_ANY ) ), "C Structure", 11 ) == 0 ) + if( strncmp( hb_objGetClsName( hb_param( i, HB_IT_ANY ) ), "C Structure", 11 ) == 0 ) { - Parm[iCnt].nWidth = sizeof( void * ); - Parm[iCnt].dwArg = (DWORD) hb_parcstruct( i ); + Parm[ iCnt ].nWidth = sizeof( void * ); + Parm[ iCnt ].dwArg = ( DWORD ) hb_parcstruct( i ); break; } #endif @@ -556,7 +566,7 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int case HB_IT_MEMVAR: default: - MessageBox( GetActiveWindow(), "Parameter error: Unknown parameter type", "hbw32 - DllCall()", MB_OK | MB_ICONERROR ); + hb_errRT_BASE( EG_ARG, 2010, "Unknown parameter type to DLL function", HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -564,28 +574,8 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int } } - /* SetLastError(0); */ rc = DynaCall( iFlags, lpFunction, iArgCnt, Parm, NULL, 0 ); - /* - if( GetLastError() ) - { - LPVOID lpMsgBuf; - - FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &lpMsgBuf, - 0, NULL ); - - MessageBox( GetActiveWindow(), (LPCSTR) lpMsgBuf, "hbw32 - DynaCall() failure", MB_OK | MB_ICONERROR ); - - LocalFree(lpMsgBuf); - } - */ - if( iArgCnt > 0 ) { iCnt = 0; @@ -597,44 +587,42 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int switch( hb_parinfo( i ) & ~HB_IT_BYREF ) { case HB_IT_NIL: - hb_stornl( Parm[iCnt].dwArg, i ); + hb_stornl( Parm[ iCnt ].dwArg, i ); break; case HB_IT_POINTER: - hb_storptr( (void *) Parm[iCnt].dwArg, i ); + hb_storptr( (void *) Parm[ iCnt ].dwArg, i ); break; case HB_IT_INTEGER: case HB_IT_LONG: case HB_IT_DATE: case HB_IT_LOGICAL: - hb_stornl( Parm[iCnt].dwArg, i ); + hb_stornl( Parm[ iCnt ].dwArg, i ); break; case HB_IT_DOUBLE: - hb_stornd( Parm[iCnt].dArg, i ); + hb_stornd( Parm[ iCnt ].dArg, i ); break; case HB_IT_STRING: case HB_IT_MEMO: - if( !hb_storclen_buffer( (char *) Parm[iCnt].pArg, hb_parclen( i ), i ) ) - hb_xfree( Parm[iCnt].pArg ); + if( ! hb_storclen_buffer( ( char * ) Parm[ iCnt ].pArg, hb_parclen( i ), i ) ) + hb_xfree( Parm[ iCnt ].pArg ); break; - #ifdef __XHARBOUR__ case HB_IT_ARRAY: - if( strncmp( hb_objGetClsName( hb_param(i, HB_IT_ANY ) ), "C Structure", 11 ) == 0 ) + if( strncmp( hb_objGetClsName( hb_param( i, HB_IT_ANY ) ), "C Structure", 11 ) == 0 ) { hb_vmPushDynSym( pDEVALUE ); hb_vmPush( hb_param( i, HB_IT_ANY ) ); - hb_vmSend(0); + hb_vmSend( 0 ); break; } #endif - default: - MessageBox( GetActiveWindow(), "Parameter error: Unknown parameter type (return)", "hbw32 - DllCall()", MB_OK | MB_ICONERROR ); + hb_errRT_BASE( EG_ARG, 2010, "Unknown reference parameter type to DLL function", HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } } @@ -703,7 +691,7 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, int iParams, int break; default: - MessageBox( GetActiveWindow(), "Parameter error: Unknown return type", "hbw32 - DllCall()", MB_OK | MB_ICONERROR ); + hb_errRT_BASE( EG_ARG, 2010, "Unknown return type from DLL function", HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); break; } } @@ -753,23 +741,17 @@ HB_FUNC( DLLPREPARECALL ) { if( ISCHAR( 3 ) ) { - /* Not a typo - reserving space for possible Ansi 'A' suffix! */ - xec->cProc = ( char * ) hb_xgrab( hb_parclen( 3 ) + 2 ); + xec->cProc = ( char * ) hb_xgrab( hb_parclen( 3 ) + 2 ); /* Not a typo - reserving space for possible Ansi 'A' suffix! */ hb_strncpy( xec->cProc, hb_parc( 3 ), hb_parclen( 3 ) ); } else if( ISNUM( 3 ) ) xec->wOrdinal = hb_parni( 3 ); } else - { - if( xec->cDLL ) - MessageBox( GetActiveWindow(), "DllPrepareCall() -> LoadLibrary() failed", xec->cDLL, MB_OK | MB_ICONERROR ); - else - MessageBox( GetActiveWindow(), "Invalid handle argument", "hbw32 - DllPrepareCall()", MB_OK | MB_ICONERROR ); - } + hb_errRT_BASE( EG_ARG, 2010, xec->cDLL ? "LoadLibrary() failed" : "Invalid handle argument", HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); xec->dwType = EXEC_DLL; - xec->lpFunc = ( LPVOID ) GetProcAddress( xec->hDLL, xec->cProc != NULL ? (LPCSTR) xec->cProc : (LPCSTR) xec->wOrdinal ); + xec->lpFunc = ( LPVOID ) GetProcAddress( xec->hDLL, xec->cProc ? ( LPCSTR ) xec->cProc : ( LPCSTR ) xec->wOrdinal ); if( xec->lpFunc == NULL && xec->cProc ) { @@ -777,34 +759,13 @@ HB_FUNC( DLLPREPARECALL ) xec->cProc[ hb_parclen( 3 ) ] = 'A'; xec->cProc[ hb_parclen( 3 ) + 1 ] = '\0'; - xec->lpFunc = ( LPVOID ) GetProcAddress( xec->hDLL, xec->cProc != NULL ? (LPCSTR) xec->cProc : (LPCSTR) xec->wOrdinal ); + xec->lpFunc = ( LPVOID ) GetProcAddress( xec->hDLL, xec->cProc ? ( LPCSTR ) xec->cProc : ( LPCSTR ) xec->wOrdinal ); } if( xec->hDLL && xec->lpFunc ) - { - hb_retptrGC( xec ); - } + hb_retptrGC( xec ); else if( xec->hDLL && xec->lpFunc == NULL ) - { - if( xec->cProc ) - { - LPVOID lpMsgBuf; - - FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &lpMsgBuf, - 0, NULL ); - - MessageBox( GetActiveWindow(), (LPCSTR) lpMsgBuf, "hbw32 - DllPrepareCall():GetProcAddress() failed", MB_OK | MB_ICONERROR ); - - LocalFree(lpMsgBuf); - } - else - MessageBox( GetActiveWindow(), "GetProcAddress() invalid ordinal argument", "hbw32 - DllPrepareCall()", MB_OK | MB_ICONERROR ); - } + hb_errRT_BASE( EG_ARG, 2010, xec->cProc ? "GetProcAddress() invalid name argument" : "GetProcAddress() invalid ordinal argument", HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( DLLLOAD ) @@ -821,23 +782,14 @@ HB_FUNC( DLLEXECUTECALL ) { PXPP_DLLEXEC xec = ( PXPP_DLLEXEC ) hb_parptr( 1 ); - if( xec && - xec->dwType == EXEC_DLL && - xec->hDLL && - xec->lpFunc ) - { - int iParams = hb_pcount(); - - DllExec( 0, 0, NULL, iParams, 2, iParams - 1, xec ); - } + if( xec && xec->dwType == EXEC_DLL && xec->hDLL && xec->lpFunc ) + DllExec( 0, 0, NULL, xec, hb_pcount(), 2 ); } HB_FUNC( DLLCALL ) { - BOOL lUnload; - HINSTANCE hInst; - LPVOID lpFunction; + BOOL lUnload; if( ISCHAR( 1 ) ) { @@ -852,25 +804,22 @@ HB_FUNC( DLLCALL ) if( hInst && ( DWORD ) hInst >= 32 ) { + LPVOID lpFunction; + if( ( lpFunction = ( LPVOID ) GetProcAddress( ( HMODULE ) hInst, ISCHAR( 3 ) ? ( LPCSTR ) hb_parc( 3 ) : ( LPCSTR ) hb_parni( 3 ) ) ) == 0 ) { if( ISCHAR( 3 ) ) { - /* try forced ANSI flavour? */ + /* try ANSI flavour */ char cFuncName[ MAX_PATH ]; hb_strncpy( cFuncName, hb_parc( 3 ), sizeof( cFuncName ) - 2 ); strcat( cFuncName, "A" ); - lpFunction = (LPVOID) GetProcAddress( (HMODULE) hInst, cFuncName ); + lpFunction = ( LPVOID ) GetProcAddress( ( HMODULE ) hInst, cFuncName ); } } - if( lpFunction ) - { - int iParams = hb_pcount(); - - DllExec( hb_parni( 2 ), 0, lpFunction, iParams, 4, iParams - 3, NULL ); - } + DllExec( hb_parni( 2 ), 0, lpFunction, NULL, hb_pcount(), 4 ); if( lUnload ) FreeLibrary( hInst ); @@ -922,29 +871,20 @@ HB_FUNC( GETPROCADDRESS ) } /* Call a DLL function from (x)Harbour, the first parameter is a pointer returned from - GetProcAddress above. Note that it is hardcoded to use PASCAL calling convention. */ + GetProcAddress() above. Note that it is hardcoded to use PASCAL calling convention. */ HB_FUNC( CALLDLL ) { - LPVOID lpFunction = ( LPVOID ) hb_parptr( 1 ); - - if( lpFunction ) - { - int iParams = hb_pcount(); - - DllExec( DC_CALL_STD, 0, lpFunction, iParams, 2, iParams - 1, NULL ); - } + DllExec( DC_CALL_STD, 0, ( LPVOID ) hb_parptr( 1 ), NULL, hb_pcount(), 2 ); } HB_FUNC( CALLDLLBOOL ) { - LPVOID lpFunction = ( LPVOID ) hb_parptr( 1 ); + DllExec( DC_CALL_STD, CTYPE_BOOL, ( LPVOID ) hb_parptr( 1 ), NULL, hb_pcount(), 2 ); +} - if( lpFunction ) - { - int iParams = hb_pcount(); - - DllExec( DC_CALL_STD, CTYPE_BOOL, lpFunction, iParams, 2, iParams - 1, NULL ); - } +HB_FUNC( CALLDLLTYPED ) +{ + DllExec( DC_CALL_STD, hb_parni( 2 ), ( LPVOID ) hb_parptr( 1 ), NULL, hb_pcount(), 3 ); } #endif /* HB_OS_WIN32 */ diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 00c13a629e..531481828d 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -398,7 +398,7 @@ static ERRCODE hb_adsCheckLock( ADSAREAP pArea ) u32RetVal = AdsIsRecordLocked( pArea->hTable, 0, &u16Locked ); if( u32RetVal != AE_SUCCESS ) { - hb_errRT_DBCMD( EG_UNLOCKED, u32RetVal, "Lock Required by ADSTESTRECLOCKS()", &hb_errFuncName ); + hb_errRT_DBCMD( EG_UNLOCKED, u32RetVal, "Lock Required by ADSTESTRECLOCKS()", HB_ERR_FUNCNAME ); return FAILURE; } if( !u16Locked ) @@ -5050,7 +5050,7 @@ HB_FUNC( ADSGETRELKEYPOS ) if( pArea ) hb_retnd( adsGetRelPos( pArea, pArea->hOrdCurrent ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSSETRELKEYPOS ) @@ -5060,7 +5060,7 @@ HB_FUNC( ADSSETRELKEYPOS ) if( pArea ) adsSetRelPos( pArea, pArea->hOrdCurrent, hb_parnd( 1 ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSCUSTOMIZEAOF ) @@ -5126,5 +5126,5 @@ HB_FUNC( ADSCUSTOMIZEAOF ) hb_retnl( u32RetVal ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c index aa6767cca7..d2be804846 100644 --- a/harbour/contrib/rddads/adsfunc.c +++ b/harbour/contrib/rddads/adsfunc.c @@ -282,10 +282,10 @@ HB_FUNC( ADSISTABLELOCKED ) if( AdsIsTableLocked( pArea->hTable, &pbLocked ) == AE_SUCCESS ) hb_retl( pbLocked != 0 ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSISRECORDLOCKED ) @@ -305,10 +305,10 @@ HB_FUNC( ADSISRECORDLOCKED ) if( AdsIsRecordLocked( pArea->hTable, ulRec, &pbLocked ) == AE_SUCCESS ) hb_retl( pbLocked != 0 ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSLOCKING ) @@ -363,7 +363,7 @@ HB_FUNC( ADSGETTABLECHARTYPE ) hb_retni( usCharType ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSSETDEFAULT ) @@ -431,10 +431,10 @@ HB_FUNC( ADSBLOB2FILE ) ( UNSIGNED8 * ) szFieldName, ( UNSIGNED8 * ) szFileName ) == AE_SUCCESS ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSFILE2BLOB ) @@ -453,10 +453,10 @@ HB_FUNC( ADSFILE2BLOB ) ( UNSIGNED16 ) ( hb_pcount() > 2 ? hb_parni( 3 ) : ADS_BINARY ) /* usBinaryType */, ( UNSIGNED8 * ) szFileName ) == AE_SUCCESS ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } /* 2nd parameter: unsupported Bag Name. */ @@ -520,10 +520,10 @@ HB_FUNC( ADSKEYNO ) hb_retnl( pulKey ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } /* 2nd parameter: unsupported Bag Name. */ @@ -640,10 +640,10 @@ HB_FUNC( ADSKEYCOUNT ) hb_retnl( pulKey ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSADDCUSTOMKEY ) @@ -674,10 +674,10 @@ HB_FUNC( ADSADDCUSTOMKEY ) else if( pArea->hOrdCurrent != 0 ) hb_retnl( ( long ) AdsAddCustomKey( pArea->hOrdCurrent ) ); else - hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSDELETECUSTOMKEY ) @@ -708,10 +708,10 @@ HB_FUNC( ADSDELETECUSTOMKEY ) else if( pArea->hOrdCurrent != 0 ) hb_retnl( ( long ) AdsDeleteCustomKey( pArea->hOrdCurrent ) ); else - hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOORDER, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSCLEARAOF ) @@ -721,7 +721,7 @@ HB_FUNC( ADSCLEARAOF ) if( pArea ) AdsClearAOF( pArea->hTable ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSEVALAOF ) @@ -746,7 +746,7 @@ HB_FUNC( ADSEVALAOF ) hb_retni( pusOptLevel ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSGETTABLEALIAS ) @@ -766,7 +766,7 @@ HB_FUNC( ADSGETTABLEALIAS ) hb_retc( NULL ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSGETAOF ) @@ -804,7 +804,7 @@ HB_FUNC( ADSGETAOF ) hb_xfree( pucFilter2 ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSGETAOFOPTLEVEL ) @@ -821,7 +821,7 @@ HB_FUNC( ADSGETAOFOPTLEVEL ) NULL ) == AE_SUCCESS ? pusOptLevel : ADS_OPTIMIZED_NONE ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSGETAOFNOOPT ) @@ -854,7 +854,7 @@ HB_FUNC( ADSGETAOFNOOPT ) hb_retc( ulRetVal == AE_SUCCESS ? ( char * ) pucNonOpt : NULL ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSISRECORDINAOF ) @@ -870,7 +870,7 @@ HB_FUNC( ADSISRECORDINAOF ) &bIsInAOF ) == AE_SUCCESS && bIsInAOF != 0 ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } /* Does current record match any current filter? */ @@ -906,7 +906,7 @@ HB_FUNC( ADSREFRESHAOF ) if( pArea ) AdsRefreshAOF( pArea->hTable ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSSETAOF ) @@ -929,10 +929,10 @@ HB_FUNC( ADSSETAOF ) hb_retl( ulRetVal == AE_SUCCESS ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSGETFILTER ) @@ -989,10 +989,10 @@ HB_FUNC( ADSENABLEENCRYPTION ) hb_retnl( AdsEnableEncryption( pArea->hTable, ( UNSIGNED8 * ) pucPassword ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSDISABLEENCRYPTION ) @@ -1002,7 +1002,7 @@ HB_FUNC( ADSDISABLEENCRYPTION ) if( pArea ) hb_retnl( AdsDisableEncryption( pArea->hTable ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSENCRYPTTABLE ) @@ -1012,7 +1012,7 @@ HB_FUNC( ADSENCRYPTTABLE ) if( pArea ) hb_retnl( AdsEncryptTable( pArea->hTable ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSDECRYPTTABLE ) @@ -1022,7 +1022,7 @@ HB_FUNC( ADSDECRYPTTABLE ) if( pArea ) hb_retnl( AdsDecryptTable( pArea->hTable ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSENCRYPTRECORD ) @@ -1032,7 +1032,7 @@ HB_FUNC( ADSENCRYPTRECORD ) if( pArea ) hb_retnl( AdsEncryptRecord( pArea->hTable ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSDECRYPTRECORD ) @@ -1042,7 +1042,7 @@ HB_FUNC( ADSDECRYPTRECORD ) if( pArea ) hb_retnl( AdsDecryptRecord( pArea->hTable ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSISENCRYPTIONENABLED ) @@ -1056,7 +1056,7 @@ HB_FUNC( ADSISENCRYPTIONENABLED ) hb_retl( usIsEnabled != 0 ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSISRECORDENCRYPTED ) @@ -1070,7 +1070,7 @@ HB_FUNC( ADSISRECORDENCRYPTED ) hb_retl( usIsEnabled != 0 ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSISTABLEENCRYPTED ) @@ -1084,7 +1084,7 @@ HB_FUNC( ADSISTABLEENCRYPTED ) hb_retl( usIsEnabled != 0 ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSCONNECT ) @@ -1338,7 +1338,7 @@ HB_FUNC( ADSVERIFYSQL ) hb_adsOemAnsiFree( pucStmt ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } #endif /* ADS_LIB_VERSION >= 620 */ @@ -1360,7 +1360,7 @@ HB_FUNC( ADSREFRESHRECORD ) if( pArea ) AdsRefreshRecord( pArea->hTable ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } /* lSuccess := AdsCopyTable( cTargetFile [, nAdsFilterOption ] ) */ @@ -1375,10 +1375,10 @@ HB_FUNC( ADSCOPYTABLE ) ( UNSIGNED16 ) ( ISNUM( 2 ) ? hb_parni( 2 ) : ADS_RESPECTFILTERS ) /* usFilterOption */, ( UNSIGNED8 * ) hb_parcx( 1 ) /* pucFile */ ) == AE_SUCCESS ); else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSCONVERTTABLE ) @@ -1395,10 +1395,10 @@ HB_FUNC( ADSCONVERTTABLE ) ( UNSIGNED16 ) ( ISNUM( 2 ) ? hb_parni( 2 ) : ADS_ADT ) /* usTableType */ ) == AE_SUCCESS ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } #if !defined( ADS_LINUX ) @@ -1586,7 +1586,7 @@ HB_FUNC( ADSCACHERECORDS ) ( UNSIGNED16 ) hb_parni( 1 ) ) == AE_SUCCESS ) hb_retl( TRUE ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } /* @@ -1659,10 +1659,10 @@ HB_FUNC( ADSISEMPTY ) &pbEmpty ) == AE_SUCCESS ) hb_retl( pbEmpty != 0 ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } /* Please add all-version functions above this block */ @@ -1968,7 +1968,7 @@ HB_FUNC( ADSDDGETUSERPROPERTY ) hb_retl( ulRetVal == AE_SUCCESS ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } @@ -2050,13 +2050,13 @@ HB_FUNC( ADSCOPYTABLECONTENTS ) pDest->hTable, ADS_IGNOREFILTERS ) == AE_SUCCESS ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSDIRECTORY ) @@ -2133,10 +2133,10 @@ HB_FUNC( ADSSTMTSETTABLEPASSWORD ) ( UNSIGNED8 * ) pucTableName, ( UNSIGNED8 * ) pucPassword ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_ARG, 1014, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, 1014, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ADSGETSERVERNAME ) @@ -2193,7 +2193,7 @@ HB_FUNC( ADSCREATEFTSINDEX ) ( UNSIGNED8 * ) hb_parc( 16 ) /* pucReserved2 */ , ( UNSIGNED32 ) ISNUM( 17 ) ? hb_parnl( 17 ) : ADS_DEFAULT /* ulOptions */ ) ); else - hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, 2001, NULL, HB_ERR_FUNCNAME ); } #endif /* ADS_LIB_VERSION >= 700 */ diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index 5d28e3d966..5e02b3e3e1 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -201,49 +201,49 @@ HB_FUNC( DBEVAL ) pEvalInfo.itmBlock = hb_param( 1, HB_IT_BLOCK ); if( !pEvalInfo.itmBlock ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBEVAL" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } pEvalInfo.dbsci.itmCobFor = hb_param( 2, HB_IT_BLOCK ); if( !pEvalInfo.dbsci.itmCobFor && !ISNIL( 2 ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBEVAL" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } pEvalInfo.dbsci.itmCobWhile = hb_param( 3, HB_IT_BLOCK ); if( !pEvalInfo.dbsci.itmCobWhile && !ISNIL( 3 ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBEVAL" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } pEvalInfo.dbsci.lNext = hb_param( 4, HB_IT_NUMERIC ); if( !pEvalInfo.dbsci.lNext && !ISNIL( 4 ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBEVAL" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } pEvalInfo.dbsci.itmRecID = hb_param( 5, HB_IT_NUMERIC ); if( !pEvalInfo.dbsci.itmRecID && !ISNIL( 5 ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBEVAL" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } pEvalInfo.dbsci.fRest = hb_param( 6, HB_IT_LOGICAL ); if( !pEvalInfo.dbsci.fRest && !ISNIL( 6 ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBEVAL" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } SELF_DBEVAL( pArea, &pEvalInfo ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBEVAL" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBF ) @@ -289,7 +289,7 @@ HB_FUNC( DBAPPEND ) hb_retl( errCode == SUCCESS ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBAPPEND" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBCLEARFILTER ) @@ -299,7 +299,7 @@ HB_FUNC( DBCLEARFILTER ) if( pArea ) SELF_CLEARFILTER( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBCLEARFILTER" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBCLOSEALL ) @@ -318,7 +318,7 @@ HB_FUNC( DBCOMMIT ) if( pArea ) SELF_FLUSH( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBCOMMIT" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBCOMMITALL ) @@ -370,7 +370,7 @@ HB_FUNC( DBCREATE ) #endif !szFileName ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, "DBCREATE" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } uiLen = ( USHORT ) hb_arrayLen( pStruct ); @@ -386,7 +386,7 @@ HB_FUNC( DBCREATE ) !( hb_arrayGetType( pFieldDesc, 3 ) & HB_IT_NUMERIC ) || !( hb_arrayGetType( pFieldDesc, 4 ) & HB_IT_NUMERIC ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, "DBCREATE" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } } @@ -433,7 +433,7 @@ HB_FUNC( __DBOPENSDF ) hb_arrayLen( pStruct ) == 0 || !szFileName || !szFileName[ 0 ] ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, "__DBOPENSDF" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } uiLen = ( USHORT ) hb_arrayLen( pStruct ); @@ -449,7 +449,7 @@ HB_FUNC( __DBOPENSDF ) !( hb_arrayGetType( pFieldDesc, 3 ) & HB_IT_NUMERIC ) || !( hb_arrayGetType( pFieldDesc, 4 ) & HB_IT_NUMERIC ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, "__DBOPENSDF" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } } @@ -474,7 +474,7 @@ HB_FUNC( DBDELETE ) if( pArea ) SELF_DELETE( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBDELETE" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBFILTER ) @@ -498,7 +498,7 @@ HB_FUNC( DBGOBOTTOM ) if( pArea ) SELF_GOBOTTOM( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBGOBOTTOM" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBGOTO ) @@ -509,12 +509,12 @@ HB_FUNC( DBGOTO ) { PHB_ITEM pItem = hb_param( 1, HB_IT_ANY ); if( !pItem ) - hb_errRT_DBCMD( EG_ARG, EDBCMD_NOVAR, NULL, "DBGOTO" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_NOVAR, NULL, HB_ERR_FUNCNAME ); else SELF_GOTOID( pArea, pItem ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBGOTO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBGOTOP ) @@ -524,7 +524,7 @@ HB_FUNC( DBGOTOP ) if( pArea ) SELF_GOTOP( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBGOTOP" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( __DBLOCATE ) @@ -552,7 +552,7 @@ HB_FUNC( __DBLOCATE ) SELF_LOCATE( pArea, FALSE ); } else - hb_errRT_DBCMD( EG_NOTABLE, EG_NOTABLE, NULL, "__DBLOCATE" ); + hb_errRT_DBCMD( EG_NOTABLE, EG_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( __DBSETLOCATE ) @@ -580,7 +580,7 @@ HB_FUNC( __DBCONTINUE ) if( pArea ) SELF_LOCATE( pArea, TRUE ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "__DBCONTINUE" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( __DBPACK ) @@ -616,7 +616,7 @@ HB_FUNC( __DBPACK ) hb_itemClear( pArea->valResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "__DBPACK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBRECALL ) @@ -625,7 +625,7 @@ HB_FUNC( DBRECALL ) if( pArea ) SELF_RECALL( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBRECALL" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBRLOCK ) @@ -645,7 +645,7 @@ HB_FUNC( DBRLOCK ) hb_retl( dbLockInfo.fResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBRLOCK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBRLOCKLIST ) @@ -659,7 +659,7 @@ HB_FUNC( DBRLOCKLIST ) hb_itemReturnRelease( pList ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBRLOCKLIST" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } @@ -670,7 +670,7 @@ HB_FUNC( DBRUNLOCK ) if( pArea ) SELF_UNLOCK( pArea, hb_param( 1, HB_IT_ANY ) ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBRUNLOCK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBSEEK ) @@ -692,10 +692,10 @@ HB_FUNC( DBSEEK ) hb_retl( fFound ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_SEEK_BADPARAMETER, NULL, "DBSEEK" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_SEEK_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBSEEK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBSELECTAREA ) @@ -770,7 +770,7 @@ HB_FUNC( DBSETFILTER ) } } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBSETFILTER" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBSKIP ) @@ -779,7 +779,7 @@ HB_FUNC( DBSKIP ) if( pArea ) SELF_SKIP( pArea, ISNUM( 1 ) ? hb_parnl( 1 ) : 1 ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBSKIP" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBSTRUCT ) @@ -825,7 +825,7 @@ HB_FUNC( DBUNLOCK ) if( pArea ) SELF_UNLOCK( pArea, NULL ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBUNLOCK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBUNLOCKALL ) @@ -848,7 +848,7 @@ HB_FUNC( __DBZAP ) if( pArea ) SELF_ZAP( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "__DBZAP" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DELETED ) @@ -914,7 +914,7 @@ HB_FUNC( FIELDNAME ) } /* This is not Clipper compatible! - David G. Holm * - hb_errRT_DBCMD( EG_ARG, EDBCMD_FIELDNAME_BADPARAMETER, NULL, "FIELDNAME" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_FIELDNAME_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); */ } hb_retc( NULL ); @@ -965,7 +965,7 @@ HB_FUNC( FLOCK ) hb_retl( dbLockInfo.fResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "FLOCK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( FOUND ) @@ -1035,7 +1035,7 @@ HB_FUNC( LOCK ) hb_retl( dbLockInfo.fResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "LOCK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( LUPDATE ) @@ -1111,7 +1111,7 @@ HB_FUNC( ORDBAGNAME ) } else { - hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDBAGNAME" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } } @@ -1120,7 +1120,7 @@ HB_FUNC( ORDBAGNAME ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDBAGNAME" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDCONDSET ) @@ -1217,7 +1217,7 @@ HB_FUNC( ORDCREATE ) ( dbOrderInfo.atomBagName == NULL || strlen( ( char * ) dbOrderInfo.atomBagName ) == 0 ) ) || !dbOrderInfo.abExpr ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDCREATE" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } dbOrderInfo.itmCobExpr = hb_param( 4, HB_IT_BLOCK ); @@ -1238,7 +1238,7 @@ HB_FUNC( ORDCREATE ) SELF_ORDCREATE( pArea, &dbOrderInfo ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDCREATE" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDBAGCLEAR ) @@ -1295,7 +1295,7 @@ HB_FUNC( ORDFOR ) } else { - hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDFOR" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } } @@ -1308,7 +1308,7 @@ HB_FUNC( ORDFOR ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDFOR" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDKEY ) @@ -1331,7 +1331,7 @@ HB_FUNC( ORDKEY ) } else { - hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDKEY" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } } @@ -1341,7 +1341,7 @@ HB_FUNC( ORDKEY ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEY" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDLISTADD ) @@ -1363,7 +1363,7 @@ HB_FUNC( ORDLISTADD ) if( !pOrderInfo.atomBagName ) { if( !ISNIL( 1 ) ) - hb_errRT_DBCMD( EG_ARG, EDBCMD_ORDLSTADD_BADPARAMETER, NULL, "ORDLISTADD" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_ORDLSTADD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } @@ -1379,7 +1379,7 @@ HB_FUNC( ORDLISTADD ) hb_itemRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDLISTADD" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDLISTCLEAR ) @@ -1389,7 +1389,7 @@ HB_FUNC( ORDLISTCLEAR ) if( pArea ) SELF_ORDLSTCLEAR( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDLISTCLEAR" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDLISTREBUILD ) @@ -1399,7 +1399,7 @@ HB_FUNC( ORDLISTREBUILD ) if( pArea ) SELF_ORDLSTREBUILD( pArea ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDLISTREBUILD" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDNAME ) @@ -1422,7 +1422,7 @@ HB_FUNC( ORDNAME ) } else { - hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDNAME" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } } @@ -1433,7 +1433,7 @@ HB_FUNC( ORDNAME ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDNAME" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDNUMBER ) @@ -1449,7 +1449,7 @@ HB_FUNC( ORDNUMBER ) if( !( pOrderInfo.itmOrder || ISNIL( 1 ) ) || !( pOrderInfo.atomBagName || ISNIL( 2 ) ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "ORDNUMBER" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } pOrderInfo.itmResult = hb_itemPutNI( NULL, 0 ); @@ -1457,7 +1457,7 @@ HB_FUNC( ORDNUMBER ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDNUMBER" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDSETFOCUS ) @@ -1477,7 +1477,7 @@ HB_FUNC( ORDSETFOCUS ) hb_itemReturnRelease( pInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDSETFOCUS" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( RDDLIST ) @@ -1497,7 +1497,7 @@ HB_FUNC( RDDNAME ) hb_retc( pBuffer ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "RDDNAME" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( RDDREGISTER ) @@ -1572,7 +1572,7 @@ HB_FUNC( RLOCK ) hb_retl( dbLockInfo.fResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "RLOCK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( SELECT ) @@ -1613,7 +1613,7 @@ HB_FUNC( RDDSETDEFAULT ) if( hb_parclen( 1 ) > 0 ) { if( ! hb_rddDefaultDrv( hb_parc( 1 ) ) ) - hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "RDDSETDEFAULT" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } } @@ -1624,7 +1624,7 @@ HB_FUNC( DBSETDRIVER ) if( hb_parclen( 1 ) > 0 ) { if( ! hb_rddDefaultDrv( hb_parc( 1 ) ) ) - hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "DBSETDRIVER" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } } @@ -1665,7 +1665,7 @@ HB_FUNC( ORDSCOPE ) hb_itemReturnRelease( pInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDSCOPE" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBRELATION ) /* () --> cLinkExp */ @@ -1715,7 +1715,7 @@ HB_FUNC( DBSETRELATION ) if( hb_pcount() < 2 || ( !( hb_parinfo( 1 ) & HB_IT_NUMERIC ) && ( hb_parinfo( 1 ) != HB_IT_STRING ) ) || !( ISNIL( 4 ) || ISLOG( 4 ) ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, "DBSETRELATION" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_REL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return; } @@ -1753,7 +1753,7 @@ HB_FUNC( DBSETRELATION ) SELF_SETREL( pArea, &dbRelations ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBSETRELATION" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( __DBARRANGE ) @@ -1935,12 +1935,12 @@ HB_FUNC( __DBTRANS ) hb_retl( errCode == SUCCESS ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "__DBTRANS" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); hb_rddSelectWorkAreaNumber( uiSrcArea ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, "__DBTRANS" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( __DBAPP ) @@ -2030,7 +2030,7 @@ HB_FUNC( HB_RDDINFO ) } else { - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "RDDINFO" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } } @@ -2056,7 +2056,7 @@ HB_FUNC( HB_DBDROP ) hb_retl( SELF_DROP( pRDDNode, pName, hb_param( 2, HB_IT_STRING ), ulConnection ) == SUCCESS ); else - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "HB_DBDROP" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( HB_DBEXISTS ) @@ -2081,7 +2081,7 @@ HB_FUNC( HB_DBEXISTS ) hb_retl( SELF_EXISTS( pRDDNode, pName, hb_param( 2, HB_IT_STRING ), ulConnection ) == SUCCESS ); else - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "HB_DBEXISTS" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( HB_FIELDLEN ) diff --git a/harbour/source/rdd/dbcmd53.c b/harbour/source/rdd/dbcmd53.c index fa997ab9da..56eeeed5e4 100644 --- a/harbour/source/rdd/dbcmd53.c +++ b/harbour/source/rdd/dbcmd53.c @@ -89,7 +89,7 @@ HB_FUNC( ORDKEYCOUNT ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYCOUNT" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } @@ -112,7 +112,7 @@ HB_FUNC( ORDKEYNO ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYNO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDKEYGOTO ) @@ -129,7 +129,7 @@ HB_FUNC( ORDKEYGOTO ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYGOTO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDKEYRELPOS ) @@ -146,7 +146,7 @@ HB_FUNC( ORDKEYRELPOS ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYRELPOS" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDFINDREC ) @@ -164,7 +164,7 @@ HB_FUNC( ORDFINDREC ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYGOTO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDSKIPRAW ) @@ -173,7 +173,7 @@ HB_FUNC( ORDSKIPRAW ) if( pArea ) SELF_SKIPRAW( pArea, ISNUM( 1 ) ? hb_parnl( 1 ) : 1 ); else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDSKIPRAW" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } @@ -191,7 +191,7 @@ HB_FUNC( ORDSKIPUNIQUE ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDSKIPUNIQUE" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDKEYVAL ) @@ -207,7 +207,7 @@ HB_FUNC( ORDKEYVAL ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYVAL" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDKEYADD ) @@ -229,7 +229,7 @@ HB_FUNC( ORDKEYADD ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYADD" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDKEYDEL ) @@ -251,7 +251,7 @@ HB_FUNC( ORDKEYDEL ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDKEYDEL" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDDESCEND ) @@ -273,7 +273,7 @@ HB_FUNC( ORDDESCEND ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDDESCEND" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDISUNIQUE ) @@ -295,7 +295,7 @@ HB_FUNC( ORDISUNIQUE ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDISUNIQUE" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDCUSTOM ) @@ -317,7 +317,7 @@ HB_FUNC( ORDCUSTOM ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDCUSTOM" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( ORDCOUNT ) @@ -334,7 +334,7 @@ HB_FUNC( ORDCOUNT ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDCOUNT" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBINFO ) @@ -354,10 +354,10 @@ HB_FUNC( DBINFO ) hb_itemReturnRelease( pInfo ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBINFOBADPARAMETER, NULL, "DBINFO" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBINFOBADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBINFO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBORDERINFO ) @@ -388,10 +388,10 @@ HB_FUNC( DBORDERINFO ) hb_itemReturnRelease( pOrderInfo.itmResult ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, "DBORDERINFO" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBORDERINFO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBFIELDINFO ) @@ -414,10 +414,10 @@ HB_FUNC( DBFIELDINFO ) hb_itemReturnRelease( pInfo ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, "DBFIELDINFO" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBFIELDINFO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBRECORDINFO ) @@ -438,10 +438,10 @@ HB_FUNC( DBRECORDINFO ) hb_itemReturnRelease( pInfo ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_INFOBADPARAMETER, NULL, "DBRECORDINFO" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_INFOBADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBRECORDINFO" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } /* @@ -471,10 +471,10 @@ HB_FUNC( DBFILEGET ) hb_itemGetNI( pMode ) ) == SUCCESS ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEGETBADPARAMETER, NULL, "DBFILEGET" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEGETBADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBFILEGET" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } /* @@ -501,10 +501,10 @@ HB_FUNC( DBFILEPUT ) hb_parni( 3 ) ) == SUCCESS ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEPUTBADPARAMETER, NULL, "DBFILEPUT" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEPUTBADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBFILEPUT" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } #endif diff --git a/harbour/source/rdd/dbcmdx.c b/harbour/source/rdd/dbcmdx.c index 91ba7eb0a1..a7195ad894 100644 --- a/harbour/source/rdd/dbcmdx.c +++ b/harbour/source/rdd/dbcmdx.c @@ -119,10 +119,10 @@ HB_FUNC( ORDWILDSEEK ) hb_retl( fFound ); } else - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEPUTBADPARAMETER, NULL, "ORDWILDSEEK" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBFILEPUTBADPARAMETER, NULL, HB_ERR_FUNCNAME ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "ORDWILDSEEK" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } HB_FUNC( DBSKIPPER ) @@ -179,7 +179,7 @@ HB_FUNC( DBSKIPPER ) hb_retnl( lSkipped ); } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "DBSKIPPER" ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } #endif diff --git a/harbour/source/rdd/dbsql.c b/harbour/source/rdd/dbsql.c index 192a90daa9..34a43fd50f 100644 --- a/harbour/source/rdd/dbsql.c +++ b/harbour/source/rdd/dbsql.c @@ -353,7 +353,7 @@ HB_FUNC( __DBSQL ) ERRCODE errCode; if( ! szFileName ) - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); else if( fExport ) /* COPY TO SQL */ { PHB_ITEM pError = NULL; @@ -434,5 +434,5 @@ HB_FUNC( __DBSQL ) } } else - hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME ); } diff --git a/harbour/source/rdd/wafunc.c b/harbour/source/rdd/wafunc.c index 55bacdbc38..9149bc88fd 100644 --- a/harbour/source/rdd/wafunc.c +++ b/harbour/source/rdd/wafunc.c @@ -628,7 +628,7 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, /* First try to create new are node and validate RDD name */ if( ! hb_rddInsertAreaNode( szDriver ) ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "DBUSEAREA" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return FAILURE; } @@ -638,7 +638,7 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver, if( !szFileName ) { hb_rddReleaseCurrentArea(); - hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, "DBUSEAREA" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return FAILURE; } @@ -684,7 +684,7 @@ ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver, if( !szFileName ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, "DBCREATE" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); return FAILURE; } @@ -712,7 +712,7 @@ ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver, if( ! hb_rddInsertAreaNode( szDriver ) ) { hb_rddSelectWorkAreaNumber( uiPrevArea ); - hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "DBCREATE" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return FAILURE; } pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); @@ -1055,7 +1055,7 @@ ERRCODE hb_rddTransRecords( AREAP pArea, if( !pRddNode ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, "DBUSEAREA" ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_USE_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); return FAILURE; } diff --git a/harbour/source/rdd/workarea.c b/harbour/source/rdd/workarea.c index 14f4b84e8e..a8d8c061c1 100644 --- a/harbour/source/rdd/workarea.c +++ b/harbour/source/rdd/workarea.c @@ -453,7 +453,7 @@ static ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) if( errCode != SUCCESS ) { - hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, &hb_errFuncName ); + hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME ); return errCode; } /* Add field */ @@ -883,7 +883,7 @@ static ERRCODE hb_waOrderInfo( AREAP pArea, USHORT index, LPDBORDERINFO pInfo ) /* CA-Cl*pper does not generate RT error when default ORDERINFO() method * is called */ - /* hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "DBORDERINFO" ); */ + /* hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME ); */ return FAILURE; } diff --git a/harbour/source/rtl/abs.c b/harbour/source/rtl/abs.c index 63cf4603bc..9d4812ca32 100644 --- a/harbour/source/rtl/abs.c +++ b/harbour/source/rtl/abs.c @@ -103,5 +103,5 @@ HB_FUNC( ABS ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, "ABS", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/at.c b/harbour/source/rtl/at.c index 4e2deebed2..f2b8fdf9ec 100644 --- a/harbour/source/rtl/at.c +++ b/harbour/source/rtl/at.c @@ -85,7 +85,7 @@ HB_FUNC( HB_AT ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, "AT", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #if defined( HB_EXTENSION ) @@ -108,7 +108,7 @@ HB_FUNC( AT ) hb_itemGetCPtr( pText ), hb_itemGetCLen( pText ) ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, "AT", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif diff --git a/harbour/source/rtl/cdpapi.c b/harbour/source/rtl/cdpapi.c index 1c1e458c11..248d870a04 100644 --- a/harbour/source/rtl/cdpapi.c +++ b/harbour/source/rtl/cdpapi.c @@ -1256,7 +1256,7 @@ HB_FUNC( HB_UTF8CHR ) } else { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } } @@ -1288,7 +1288,7 @@ HB_FUNC( HB_UTF8TOSTR ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_UTF8SUBSTR ) @@ -1321,7 +1321,7 @@ HB_FUNC( HB_UTF8SUBSTR ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_UTF8LEFT ) @@ -1344,7 +1344,7 @@ HB_FUNC( HB_UTF8LEFT ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_UTF8RIGHT ) @@ -1372,7 +1372,7 @@ HB_FUNC( HB_UTF8RIGHT ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_UTF8PEEK ) @@ -1390,7 +1390,7 @@ HB_FUNC( HB_UTF8PEEK ) hb_retni( 0 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_UTF8POKE ) @@ -1436,7 +1436,7 @@ HB_FUNC( HB_UTF8POKE ) hb_itemReturn( pText ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_UTF8STUFF ) @@ -1487,7 +1487,7 @@ HB_FUNC( HB_UTF8STUFF ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_UTF8LEN ) @@ -1497,7 +1497,7 @@ HB_FUNC( HB_UTF8LEN ) if( szString ) hb_retnint( hb_cdpUTF8StringLength( ( BYTE * ) szString, hb_parclen( 1 ) ) ); else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* non of numeric parameters in STRTRAN() (4-th and 5-th) refers to diff --git a/harbour/source/rtl/chrasc.c b/harbour/source/rtl/chrasc.c index 2bdeb53204..225f11859f 100644 --- a/harbour/source/rtl/chrasc.c +++ b/harbour/source/rtl/chrasc.c @@ -77,7 +77,7 @@ HB_FUNC( CHR ) #endif } else - hb_errRT_BASE_SubstR( EG_ARG, 1104, NULL, "CHR", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1104, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* converts a character value to an ASCII code */ @@ -86,9 +86,7 @@ HB_FUNC( ASC ) char * szValue = hb_parc( 1 ); if( szValue ) - { hb_retni( ( UCHAR ) szValue[ 0 ] ); - } else - hb_errRT_BASE_SubstR( EG_ARG, 1107, NULL, "ASC", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1107, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c index fe9f067135..0d97b04c68 100644 --- a/harbour/source/rtl/copyfile.c +++ b/harbour/source/rtl/copyfile.c @@ -141,5 +141,5 @@ HB_FUNC( __COPYFILE ) hb_retl( FALSE ); } else - hb_errRT_BASE( EG_ARG, 2010, NULL, "__COPYFILE", HB_ERR_ARGS_BASEPARAMS ); /* NOTE: Undocumented but existing Clipper Run-time error */ + hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); /* NOTE: Undocumented but existing Clipper Run-time error */ } diff --git a/harbour/source/rtl/datec.c b/harbour/source/rtl/datec.c index 73f336c5d7..bef441b4be 100644 --- a/harbour/source/rtl/datec.c +++ b/harbour/source/rtl/datec.c @@ -82,7 +82,7 @@ HB_FUNC( CMONTH ) hb_retc( hb_dateCMonth( iMonth ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1116, NULL, "CMONTH", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1116, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( CDOW ) @@ -104,6 +104,5 @@ HB_FUNC( CDOW ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1117, NULL, "CDOW", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1117, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } - diff --git a/harbour/source/rtl/dateshb.c b/harbour/source/rtl/dateshb.c index 7a42c887d3..2f71a618f0 100644 --- a/harbour/source/rtl/dateshb.c +++ b/harbour/source/rtl/dateshb.c @@ -172,7 +172,7 @@ HB_FUNC( CTOD ) hb_retd( y_value, m_value, d_value ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1119, NULL, "CTOD", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1119, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( DTOC ) @@ -185,7 +185,7 @@ HB_FUNC( DTOC ) hb_retc( hb_dateFormat( hb_pardsbuff( szDate, 1 ), szFormatted, hb_set.HB_SET_DATEFORMAT ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1118, NULL, "DTOC", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1118, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( DTOS ) @@ -197,7 +197,7 @@ HB_FUNC( DTOS ) hb_retc( hb_pardsbuff( szDate, 1 ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1120, NULL, "DTOS", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1120, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* NOTE: Harbour extension, exactly the same as STOD(). */ @@ -222,7 +222,7 @@ HB_FUNC( YEAR ) hb_retnilen( iYear, 5 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1112, NULL, "YEAR", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1112, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( MONTH ) @@ -238,7 +238,7 @@ HB_FUNC( MONTH ) hb_retnilen( iMonth, 3 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1113, NULL, "MONTH", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1113, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( DAY ) @@ -254,7 +254,7 @@ HB_FUNC( DAY ) hb_retnilen( iDay, 3 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1114, NULL, "DAY", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1114, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( TIME ) @@ -280,5 +280,5 @@ HB_FUNC( DOW ) hb_retnilen( hb_dateJulianDOW( hb_itemGetDL( pDate ) ), 3 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1115, NULL, "DOW", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1115, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/do.c b/harbour/source/rtl/do.c index c5681bd89c..96d010a614 100644 --- a/harbour/source/rtl/do.c +++ b/harbour/source/rtl/do.c @@ -108,5 +108,5 @@ HB_FUNC( DO ) hb_vmDo( uiPCount - 1 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, "DO", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/gtfunc.c b/harbour/source/rtl/gtfunc.c index 0f71d9b49d..49897797dd 100644 --- a/harbour/source/rtl/gtfunc.c +++ b/harbour/source/rtl/gtfunc.c @@ -64,7 +64,7 @@ HB_FUNC( HB_SETDISPCP ) hb_gtSetDispCP( hb_parc( 1 ), hb_parc( 2 ), hb_parl( 3 ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, "HB_SETDISPCP", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_SETKEYCP ) @@ -72,7 +72,7 @@ HB_FUNC( HB_SETKEYCP ) if( ISCHAR( 1 ) ) hb_gtSetKeyCP( hb_parc( 1 ), hb_parc( 2 ) ); else - hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, "HB_SETKEYCP", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_SETTERMCP ) @@ -91,7 +91,7 @@ HB_FUNC( HB_SETTERMCP ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, "HB_SETTERMCP", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_GTINFO ) @@ -108,7 +108,7 @@ HB_FUNC( HB_GTINFO ) hb_itemReturnRelease( gtInfo.pResult ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, "HB_GTINFO", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_GTVERSION ) diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c index c47033e2a9..34f5e52d0f 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.c +++ b/harbour/source/rtl/gtwvt/gtwvt.c @@ -240,9 +240,9 @@ static int hb_gt_wvt_FireEvent( PHB_GTWVT pWVT, int nEvent ) if( hb_vmRequestReenter() ) { PHB_ITEM pEvent = hb_itemPutNI( NULL, nEvent ); - + nResult = hb_itemGetNI( hb_vmEvalBlockV( ( PHB_ITEM ) pWVT->pGT->pNotifierBlock, 1, pEvent ) ); - + hb_itemRelease( pEvent ); hb_vmRequestRestore(); @@ -470,17 +470,38 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode ) { RECT wi, ci; BOOL bValid = TRUE; + LONG maxWidth; + LONG maxHeight; + LONG borderwidth; + LONG borderheight; + SHORT left; + SHORT top; HB_SYMBOL_UNUSED( mode ); + GetClientRect( pWVT->hWnd, &ci ); + GetWindowRect( pWVT->hWnd, &wi ); + + borderwidth = ( wi.right - wi.left - ( ci.right - ci.left ) ); + borderheight = ( wi.bottom - wi.top - ( ci.bottom - ci.top ) ); + if( pWVT->bMaximized ) { - SystemParametersInfo( SPI_GETWORKAREA, 0, &ci, 0 ); + SystemParametersInfo( SPI_GETWORKAREA, 0, &wi, 0 ); + + maxHeight = wi.bottom - wi.top - borderwidth; + maxWidth = wi.right - wi.left - borderheight; + + left = 0; + top = 0; } else { - GetWindowRect( pWVT->hWnd, &wi ); - GetClientRect( pWVT->hWnd, &ci ); + maxHeight = ci.bottom - ci.top; + maxWidth = ci.right - ci.left; + + left = ( wi.left < 0 ? 0 : wi.left ); + top = ( wi.top < 0 ? 0 : wi.top ); } if( bValid ) @@ -488,12 +509,9 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode ) HDC hdc; HFONT hOldFont, hFont; USHORT fontHeight, fontWidth, n; - LONG width, height, maxWidth, maxHeight; - SHORT left, top; + LONG width, height; TEXTMETRIC tm; - maxHeight = ci.bottom - ci.top; - maxWidth = ci.right - ci.left; fontHeight = maxHeight / pWVT->ROWS; fontWidth = maxWidth / pWVT->COLS; @@ -507,15 +525,14 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode ) SelectObject( hdc, hOldFont ); ReleaseDC( pWVT->hWnd, hdc ); - width = ( tm.tmAveCharWidth * pWVT->COLS ); - height = ( tm.tmHeight * pWVT->ROWS ); + width = ( tm.tmAveCharWidth * pWVT->COLS ); + height = ( ( tm.tmHeight - ( pWVT->bMaximized ? 1 : 0 ) ) * pWVT->ROWS ); if( width <= maxWidth && height <= maxHeight ) { if( pWVT->hFont ) - { DeleteObject( pWVT->hFont ); - } + pWVT->hFont = hFont; pWVT->fontHeight = tm.tmHeight; pWVT->fontWidth = tm.tmAveCharWidth; @@ -531,26 +548,10 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode ) ( pWVT->PTEXTSIZE.x == tm.tmMaxCharWidth ); #endif for( n = 0; n < pWVT->COLS; n++ ) - { pWVT->FixedSize[ n ] = pWVT->PTEXTSIZE.x; - } - height = ( USHORT ) ( pWVT->PTEXTSIZE.y * pWVT->ROWS ); - width = ( USHORT ) ( pWVT->PTEXTSIZE.x * pWVT->COLS ); - - if( pWVT->bMaximized ) - { - left = 0; - top = 0; - } - else - { - width += ( USHORT ) ( wi.right - wi.left - ci.right ); - height += ( USHORT ) ( wi.bottom - wi.top - ci.bottom ); - - left = ( wi.left < 0 ? 0 : wi.left ); - top = ( wi.top < 0 ? 0 : wi.top ); - } + width = ( ( USHORT ) ( pWVT->PTEXTSIZE.x * pWVT->COLS ) ) + borderwidth; + height = ( ( USHORT ) ( pWVT->PTEXTSIZE.y * pWVT->ROWS ) ) + borderheight; hb_gt_wvt_KillCaret( pWVT ); hb_gt_wvt_UpdateCaret( pWVT ); @@ -783,8 +784,8 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L left = pWVT->markStartColRow.x; top = pWVT->markStartColRow.y; - right = pWVT->markEndColRow.x+1; - bottom = pWVT->markEndColRow.y+1; + right = pWVT->markEndColRow.x + 1; + bottom = pWVT->markEndColRow.y + 1; /* Check boundaries and reverse operation */ if( right < left ) { @@ -860,7 +861,7 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L pWVT->markEndColRow = colrow; a0 = hb_gt_wvt_GetXYFromColRow( pWVT, ( USHORT ) pWVT->markStartColRow.x, ( USHORT ) pWVT->markStartColRow.y ); - a1 = hb_gt_wvt_GetXYFromColRow( pWVT, ( USHORT ) pWVT->markEndColRow.x+1, ( USHORT ) pWVT->markEndColRow.y+1 ); + a1 = hb_gt_wvt_GetXYFromColRow( pWVT, ( USHORT ) pWVT->markEndColRow.x + 1, ( USHORT ) pWVT->markEndColRow.y + 1 ); rect.left = a0.x; rect.top = a0.y; @@ -875,9 +876,9 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L HDC hdc = GetDC( pWVT->hWnd ); RECT rectUpd; - if( s_rectOld.left == 0 && - s_rectOld.right == 0 && - s_rectOld.top == 0 && + if( s_rectOld.left == 0 && + s_rectOld.right == 0 && + s_rectOld.top == 0 && s_rectOld.bottom == 0 ) { /* New selection */ @@ -886,10 +887,10 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L rect.top = a0.y; rect.right = a1.x; rect.bottom = a1.y; - + InvertRect( hdc, &rect ); } - else + else { int nS = 0; int nG = 0; @@ -897,12 +898,12 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L if( abs( rect.left - rect.right ) < abs( s_rectOld.left - s_rectOld.right ) ) { /* Selection shrunk horizontally */ - + rectUpd.left = rect.right; rectUpd.top = rect.top; rectUpd.right = s_rectOld.right; rectUpd.bottom = s_rectOld.bottom; - + RedrawWindow( pWVT->hWnd, &rectUpd, NULL, RDW_INVALIDATE | RDW_UPDATENOW ); ++nS; @@ -911,12 +912,12 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L if( abs( rect.top - rect.bottom ) < abs( s_rectOld.top - s_rectOld.bottom ) ) { /* Selection shrunk vertically */ - + rectUpd.left = rect.left; rectUpd.top = rect.bottom; rectUpd.right = s_rectOld.right; rectUpd.bottom = s_rectOld.bottom; - + RedrawWindow( pWVT->hWnd, &rectUpd, NULL, RDW_INVALIDATE | RDW_UPDATENOW ); ++nS; @@ -925,24 +926,24 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L if( nS == 2 ) { /* Selection shrunk horizontally + vertically */ - + rectUpd.left = rect.right; rectUpd.top = rect.bottom; rectUpd.right = s_rectOld.right; rectUpd.bottom = s_rectOld.bottom; - + RedrawWindow( pWVT->hWnd, &rectUpd, NULL, RDW_INVALIDATE | RDW_UPDATENOW ); } if( abs( rect.left - rect.right ) > abs( s_rectOld.left - s_rectOld.right ) ) { /* Selection grown horizontally */ - + rectUpd.left = s_rectOld.right; rectUpd.top = s_rectOld.top; rectUpd.right = rect.right; rectUpd.bottom = nS ? rect.bottom : s_rectOld.bottom; - + InvertRect( hdc, &rectUpd ); ++nG; @@ -951,12 +952,12 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L if( abs( rect.top - rect.bottom ) > abs( s_rectOld.top - s_rectOld.bottom ) ) { /* Selection grown vertically */ - + rectUpd.left = s_rectOld.left; rectUpd.top = s_rectOld.bottom; rectUpd.right = nS ? rect.right : s_rectOld.right; rectUpd.bottom = rect.bottom; - + InvertRect( hdc, &rectUpd ); ++nG; @@ -965,12 +966,12 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L if( nG == 2 ) { /* Selection grown horizontally + vertically */ - - rectUpd.left = s_rectOld.right; + + rectUpd.left = s_rectOld.right; rectUpd.top = s_rectOld.bottom; - rectUpd.right = rect.right; + rectUpd.right = rect.right; rectUpd.bottom = rect.bottom; - + InvertRect( hdc, &rectUpd ); } } diff --git a/harbour/source/rtl/hbadler.c b/harbour/source/rtl/hbadler.c index e981d7a603..ba3e8009ba 100644 --- a/harbour/source/rtl/hbadler.c +++ b/harbour/source/rtl/hbadler.c @@ -92,5 +92,5 @@ HB_FUNC( HB_ADLER32 ) if( szString ) hb_retnint( hb_adler32( ( ULONG ) hb_parnl( 2 ), ( BYTE * ) szString, hb_parclen( 1 ) ) ); else - hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/hbbit.c b/harbour/source/rtl/hbbit.c index de1e276203..1789b8da54 100644 --- a/harbour/source/rtl/hbbit.c +++ b/harbour/source/rtl/hbbit.c @@ -67,7 +67,7 @@ static BOOL hb_numParam( int iParam, HB_LONG * plNum ) *plNum = hb_parnint( iParam ); return TRUE; } - hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1089, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); *plNum = 0; return FALSE; } diff --git a/harbour/source/rtl/hbcrc.c b/harbour/source/rtl/hbcrc.c index c9aafad8e6..77a6a008ea 100644 --- a/harbour/source/rtl/hbcrc.c +++ b/harbour/source/rtl/hbcrc.c @@ -235,7 +235,7 @@ HB_FUNC( HB_CRC32 ) if( szString ) hb_retnint( hb_crc32( ( ULONG ) hb_parnl( 2 ), ( BYTE * ) szString, hb_parclen( 1 ) ) ); else - hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_CRC16 ) @@ -245,7 +245,7 @@ HB_FUNC( HB_CRC16 ) if( szString ) hb_retnint( hb_crc16( ( ULONG ) hb_parnl( 2 ), ( BYTE * ) szString, hb_parclen( 1 ) ) ); else - hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_CRC ) @@ -260,7 +260,7 @@ HB_FUNC( HB_CRC ) hb_retnint( hb_crc( ( HB_ULONG ) hb_parnint( 2 ), ( BYTE * ) szString, hb_parclen( 1 ), ulPolynomial ) ); } else - hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_CRCCT ) @@ -275,5 +275,5 @@ HB_FUNC( HB_CRCCT ) hb_retnint( hb_crcct( ( HB_ULONG ) hb_parnint( 2 ), ( BYTE * ) szString, hb_parclen( 1 ), ulPolynomial ) ); } else - hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/hbhex.c b/harbour/source/rtl/hbhex.c index 040e991f39..8857b4748a 100644 --- a/harbour/source/rtl/hbhex.c +++ b/harbour/source/rtl/hbhex.c @@ -83,7 +83,7 @@ HB_FUNC( HB_HEXTONUM ) hb_retnint( ulNum ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_NUMTOHEX ) @@ -111,7 +111,7 @@ HB_FUNC( HB_NUMTOHEX ) ulNum = (HB_PTRDIFF) hb_parptr( 1 ); else { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -140,7 +140,7 @@ HB_FUNC( HB_STRTOHEX ) if( !szStr || !szSep ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -178,7 +178,7 @@ HB_FUNC( HB_HEXTOSTR ) if( !szStr ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c index e81b9a486c..35c79a7d44 100644 --- a/harbour/source/rtl/hbinet.c +++ b/harbour/source/rtl/hbinet.c @@ -543,7 +543,7 @@ HB_FUNC( HB_INETCLOSE ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else if( Socket->com ) { #if defined( HB_OS_WIN_32 ) @@ -570,7 +570,7 @@ HB_FUNC( HB_INETFD ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else { hb_retnint( Socket->com ); @@ -588,7 +588,7 @@ HB_FUNC( HB_INETSTATUS ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else /* TODO: hb_retni( Socket->status ); */ hb_retni( Socket->com == 0 ? -1 : 1 ); @@ -601,7 +601,7 @@ HB_FUNC( HB_INETSTATUSDESC ) if( Socket == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -620,7 +620,7 @@ HB_FUNC( HB_INETERRORCODE ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_retni( Socket->errorCode ); } @@ -631,7 +631,7 @@ HB_FUNC( HB_INETERRORDESC ) if( Socket == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -643,7 +643,7 @@ HB_FUNC( HB_INETCLEARERROR ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else HB_SOCKET_ZERO_ERROR( Socket ); } @@ -654,7 +654,7 @@ HB_FUNC( HB_INETCOUNT ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_retni( Socket->count ); } @@ -665,7 +665,7 @@ HB_FUNC( HB_INETADDRESS ) char *addr; if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else { addr = inet_ntoa( Socket->remote.sin_addr ); @@ -678,7 +678,7 @@ HB_FUNC( HB_INETPORT ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_retni( ntohs( Socket->remote.sin_port ) ); } @@ -695,7 +695,7 @@ HB_FUNC( HB_INETTIMEOUT ) Socket->timeout = hb_parni( 2 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_INETCLEARTIMEOUT ) @@ -703,7 +703,7 @@ HB_FUNC( HB_INETCLEARTIMEOUT ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else Socket->timeout = -1; } @@ -713,7 +713,7 @@ HB_FUNC( HB_INETTIMELIMIT ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else { hb_retnl( Socket->timelimit ); @@ -727,7 +727,7 @@ HB_FUNC( HB_INETCLEARTIMELIMIT ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else Socket->timelimit = -1; } @@ -738,7 +738,7 @@ HB_FUNC( HB_INETPERIODCALLBACK ) PHB_ITEM pExec = hb_param( 2, HB_IT_ARRAY | HB_IT_BLOCK | HB_IT_SYMBOL ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else { if( Socket->caPeriodic ) @@ -757,7 +757,7 @@ HB_FUNC( HB_INETCLEARPERIODCALLBACK ) HB_SOCKET_STRUCT *Socket = HB_PARSOCKET( 1 ); if( Socket == NULL ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else if( Socket->caPeriodic ) { hb_itemRelease( Socket->caPeriodic ); @@ -779,7 +779,7 @@ static void s_inetRecvInternal( int iMode ) if( Socket == NULL || pBuffer == NULL || !ISBYREF( 2 ) ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -896,7 +896,7 @@ static void s_inetRecvPattern( char *szPattern ) if( Socket == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1059,7 +1059,7 @@ HB_FUNC( HB_INETRECVENDBLOCK ) if( Socket == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1070,7 +1070,7 @@ HB_FUNC( HB_INETRECVENDBLOCK ) iprotos = (int) hb_arrayLen( pProto ); if( iprotos <= 0 ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1244,7 +1244,7 @@ HB_FUNC( HB_INETDATAREADY ) if( Socket == NULL || ( hb_pcount() == 2 && ! ISNUM( 2 ) ) ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1282,7 +1282,7 @@ static void s_inetSendInternal( int iMode ) if( Socket == NULL || pBuffer == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1364,7 +1364,7 @@ HB_FUNC( HB_INETGETHOSTS ) if( szHost == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1406,7 +1406,7 @@ HB_FUNC( HB_INETGETALIAS ) if( szHost == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1455,7 +1455,7 @@ HB_FUNC( HB_INETSERVER ) /* Parameter error checking */ if( ! ISNUM( 1 ) || ( Socket == NULL && !ISNIL( 2 ) ) ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1538,7 +1538,7 @@ HB_FUNC( HB_INETACCEPT ) if( Socket == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1613,7 +1613,7 @@ HB_FUNC( HB_INETCONNECT ) if( szHost == NULL || !ISNUM( 2 ) || ( Socket == NULL && !ISNIL( 3 ) ) ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1671,7 +1671,7 @@ HB_FUNC( HB_INETCONNECTIP ) if( szHost == NULL || iPort == 0 || ( Socket == NULL && !ISNIL( 3 ) ) ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1727,7 +1727,7 @@ HB_FUNC( HB_INETDGRAMBIND ) /* Parameter error checking */ if( iPort == 0 || ( hb_pcount() == 4 && ! ISCHAR(4) ) ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1860,7 +1860,7 @@ HB_FUNC( HB_INETDGRAMSEND ) if( Socket == NULL || szAddress == NULL || iPort == 0 || pBuffer == NULL ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } @@ -1918,7 +1918,7 @@ HB_FUNC( HB_INETDGRAMRECV ) if( Socket == NULL || pBuffer == NULL || !ISBYREF( 2 ) ) { - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } diff --git a/harbour/source/rtl/hbregex.c b/harbour/source/rtl/hbregex.c index 47fda74a6e..599e6681b2 100644 --- a/harbour/source/rtl/hbregex.c +++ b/harbour/source/rtl/hbregex.c @@ -160,7 +160,7 @@ HB_FUNC( HB_REGEXCOMP ) if( ulLen == 0 ) hb_errRT_BASE_SubstR( EG_ARG, 3012, "Wrong parameter count/type", - &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else { int iFlags = HBREG_EXTENDED; @@ -198,7 +198,7 @@ HB_FUNC( HB_ATX ) if( !pString ) { hb_errRT_BASE_SubstR( EG_ARG, 3012, "Wrong parameters", - &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return; } pszString = hb_itemGetCPtr( pString ); @@ -257,7 +257,7 @@ static BOOL hb_regex( int iRequest ) if( !pString ) { hb_errRT_BASE_SubstR( EG_ARG, 3012, "Wrong parameters", - &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return FALSE; } pRegEx = hb_regexGet( hb_param( 1, HB_IT_ANY ), diff --git a/harbour/source/rtl/hbregexc.c b/harbour/source/rtl/hbregexc.c index ad1f1726ea..c2218d1601 100644 --- a/harbour/source/rtl/hbregexc.c +++ b/harbour/source/rtl/hbregexc.c @@ -138,7 +138,7 @@ PHB_REGEX hb_regexGet( PHB_ITEM pRegExItm, int iFlags ) } if( !pRegEx ) - hb_errRT_BASE_SubstR( EG_ARG, 3012, "Invalid Regular expression", &hb_errFuncName, 1, pRegExItm ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, "Invalid Regular expression", HB_ERR_FUNCNAME, 1, pRegExItm ); return pRegEx; } diff --git a/harbour/source/rtl/hbrunfun.c b/harbour/source/rtl/hbrunfun.c index 3e8fe16098..af37ea5144 100644 --- a/harbour/source/rtl/hbrunfun.c +++ b/harbour/source/rtl/hbrunfun.c @@ -70,5 +70,5 @@ HB_FUNC( HB_RUN ) hb_retni( iResult ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/hbtoken.c b/harbour/source/rtl/hbtoken.c index bc9eef33c9..420ceabe83 100644 --- a/harbour/source/rtl/hbtoken.c +++ b/harbour/source/rtl/hbtoken.c @@ -290,7 +290,7 @@ HB_FUNC( HB_ATOKENS ) hb_itemReturnRelease( hb_tokenArray( szLine, ulLen, szDelim, ulDelim, hb_parl( 3 ), hb_parl( 4 ) ) ); else - hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( __STRTOKEN ) diff --git a/harbour/source/rtl/hbzlib.c b/harbour/source/rtl/hbzlib.c index 5a2f871e69..5007f49a5c 100644 --- a/harbour/source/rtl/hbzlib.c +++ b/harbour/source/rtl/hbzlib.c @@ -109,7 +109,7 @@ HB_FUNC( HB_COMPRESSBOUND ) else if( ISNUM( 1 ) ) hb_retnint( compressBound( ( uLong ) hb_parnint( 1 ) ) ); else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -182,7 +182,7 @@ HB_FUNC( HB_COMPRESS ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -243,7 +243,7 @@ HB_FUNC( HB_UNCOMPRESS ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } @@ -265,7 +265,7 @@ static gzFile hb_gzParam( int iParam ) if( gzHolder && * gzHolder ) return * gzHolder; - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return NULL; } @@ -287,7 +287,7 @@ HB_FUNC( HB_GZOPEN ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -308,7 +308,7 @@ HB_FUNC( HB_GZDOPEN ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -325,7 +325,7 @@ HB_FUNC( HB_GZCLOSE ) hb_retni( gzclose( gz ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -340,7 +340,7 @@ HB_FUNC( HB_GZSETPARAMS ) hb_retni( gzsetparams( gz, hb_parni( 2 ), hb_parni( 3 ) ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -361,7 +361,7 @@ HB_FUNC( HB_GZREAD ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -378,7 +378,7 @@ HB_FUNC( HB_GZWRITE ) ( ULONG ) hb_parnl( 3 ) : hb_parclen( 2 ) ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -404,7 +404,7 @@ HB_FUNC( HB_GZGETS ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -420,7 +420,7 @@ HB_FUNC( HB_GZPUTS ) hb_retni( gzputs( gz, szData ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -445,7 +445,7 @@ HB_FUNC( HB_GZUNGETC ) hb_retni( gzungetc( hb_parni( 1 ), gz ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -471,7 +471,7 @@ HB_FUNC( HB_GZSEEK ) hb_parni( 3 ) : SEEK_SET ) ); } else - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* diff --git a/harbour/source/rtl/left.c b/harbour/source/rtl/left.c index 388411234a..9a05dd0e9e 100644 --- a/harbour/source/rtl/left.c +++ b/harbour/source/rtl/left.c @@ -75,6 +75,5 @@ HB_FUNC( LEFT ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 1124, NULL, "LEFT", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1124, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } - diff --git a/harbour/source/rtl/len.c b/harbour/source/rtl/len.c index 86ccc4c924..85964456ba 100644 --- a/harbour/source/rtl/len.c +++ b/harbour/source/rtl/len.c @@ -81,5 +81,5 @@ HB_FUNC( LEN ) } } - hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, "LEN", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c index 89cbdbedd7..d77d6743bd 100644 --- a/harbour/source/rtl/math.c +++ b/harbour/source/rtl/math.c @@ -628,9 +628,7 @@ HB_FUNC( EXP ) hb_retnd( dResult ); } else - { - hb_errRT_BASE_SubstR( EG_ARG, 1096, NULL, "EXP", HB_ERR_ARGS_BASEPARAMS ); - } + hb_errRT_BASE_SubstR( EG_ARG, 1096, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( LOG ) @@ -671,7 +669,7 @@ HB_FUNC( LOG ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 1095, NULL, "LOG", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1095, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( SQRT ) @@ -700,5 +698,5 @@ HB_FUNC( SQRT ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 1097, NULL, "SQRT", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1097, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/minmax.c b/harbour/source/rtl/minmax.c index b076ed7922..335a86aad9 100644 --- a/harbour/source/rtl/minmax.c +++ b/harbour/source/rtl/minmax.c @@ -103,7 +103,7 @@ HB_FUNC( MAX ) return; } } - hb_errRT_BASE_SubstR( EG_ARG, 1093, NULL, "MAX", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1093, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* returns the minimum of two date or numerics */ @@ -156,6 +156,5 @@ HB_FUNC( MIN ) } } - hb_errRT_BASE_SubstR( EG_ARG, 1092, NULL, "MIN", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1092, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } - diff --git a/harbour/source/rtl/philes.c b/harbour/source/rtl/philes.c index 40a9f65068..fef8c10b63 100644 --- a/harbour/source/rtl/philes.c +++ b/harbour/source/rtl/philes.c @@ -66,7 +66,7 @@ HB_FUNC( FOPEN ) { hb_fsSetFError( 0 ); /* NOTE: Undocumented but existing Clipper Run-time error */ - hb_errRT_BASE( EG_ARG, 2021, NULL, "FOPEN", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2021, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } } diff --git a/harbour/source/rtl/philesx.c b/harbour/source/rtl/philesx.c index bc1f2152de..00deb5f3d3 100644 --- a/harbour/source/rtl/philesx.c +++ b/harbour/source/rtl/philesx.c @@ -71,7 +71,7 @@ HB_FUNC( CURDRIVE ) { while( hb_fsChDrv( ( BYTE )( toupper( *hb_parc( 1 ) ) - 'A' ) ) != 0 ) { - USHORT uiAction = hb_errRT_BASE_Ext1( EG_OPEN, 6001, "Operating system error", "CURDRIVE", 0, EF_CANDEFAULT | EF_CANRETRY, HB_ERR_ARGS_BASEPARAMS ); + USHORT uiAction = hb_errRT_BASE_Ext1( EG_OPEN, 6001, "Operating system error", HB_ERR_FUNCNAME, 0, EF_CANDEFAULT | EF_CANRETRY, HB_ERR_ARGS_BASEPARAMS ); if( uiAction != E_RETRY ) break; diff --git a/harbour/source/rtl/replic.c b/harbour/source/rtl/replic.c index afb2db1535..6995bcc878 100644 --- a/harbour/source/rtl/replic.c +++ b/harbour/source/rtl/replic.c @@ -82,12 +82,11 @@ HB_FUNC( REPLICATE ) hb_retclen_buffer( szResult, ulLen * lTimes ); } else - hb_errRT_BASE_SubstR( EG_STROVERFLOW, 1234, NULL, "REPLICATE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_STROVERFLOW, 1234, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1106, NULL, "REPLICATE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1106, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } - diff --git a/harbour/source/rtl/round.c b/harbour/source/rtl/round.c index d92bcc0eea..0c53363dae 100644 --- a/harbour/source/rtl/round.c +++ b/harbour/source/rtl/round.c @@ -87,7 +87,7 @@ HB_FUNC( INT ) } } else - hb_errRT_BASE_SubstR( EG_ARG, 1090, NULL, "INT", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1090, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( ROUND ) @@ -112,5 +112,5 @@ HB_FUNC( ROUND ) #endif } else - hb_errRT_BASE_SubstR( EG_ARG, 1094, NULL, "ROUND", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1094, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/run.c b/harbour/source/rtl/run.c index b8925c917a..95f0547535 100644 --- a/harbour/source/rtl/run.c +++ b/harbour/source/rtl/run.c @@ -66,7 +66,7 @@ HB_FUNC( __RUN ) if( hb_gtResume() != 0 ) { /* an error should be generated here !! Something like */ - /* hb_errRT_BASE_Ext1( EG_GTRESUME, 6002, NULL, "__RUN", 0, EF_CANDEFAULT ); */ + /* hb_errRT_BASE_Ext1( EG_GTRESUME, 6002, NULL, HB_ERR_FUNCNAME, 0, EF_CANDEFAULT ); */ } } } diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index af16c6bcd7..4d0bce7c37 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -450,7 +450,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_AUTORDER ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_AUTORDER = set_number( pArg2, hb_set.HB_SET_AUTORDER ); } @@ -460,7 +460,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_AUTOSHARE ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_AUTOSHARE = set_number( pArg2, hb_set.HB_SET_AUTOSHARE ); } @@ -532,7 +532,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_DECIMALS ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_DECIMALS = set_number( pArg2, hb_set.HB_SET_DECIMALS ); } @@ -576,7 +576,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_EPOCH ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_EPOCH = set_number( pArg2, hb_set.HB_SET_EPOCH ); } @@ -652,7 +652,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_MARGIN ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_MARGIN = set_number( pArg2, hb_set.HB_SET_MARGIN ); } @@ -662,7 +662,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_MBLOCKSIZE ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_MBLOCKSIZE = set_number( pArg2, hb_set.HB_SET_MBLOCKSIZE ); } @@ -676,7 +676,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_MESSAGE ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_MESSAGE = set_number( pArg2, hb_set.HB_SET_MESSAGE ); } @@ -764,7 +764,7 @@ HB_FUNC( SET ) if( args > 1 ) { if( set_number( pArg2, hb_set.HB_SET_VIDEOMODE ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_VIDEOMODE = set_number( pArg2, hb_set.HB_SET_VIDEOMODE ); } @@ -797,17 +797,17 @@ HB_FUNC( SET ) else if( ! hb_stricmp( hb_itemGetCPtr( pArg2 ), "MIXED" ) ) hb_set.HB_SET_FILECASE = HB_SET_CASE_MIXED; else - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else if( HB_IS_NUMERIC( pArg2 ) ) { if( set_number( pArg2, hb_set.HB_SET_FILECASE ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_FILECASE = set_number( pArg2, hb_set.HB_SET_FILECASE ); } else - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* if( hb_set.HB_SET_FILECASE ) @@ -831,17 +831,17 @@ HB_FUNC( SET ) else if( ! hb_stricmp( hb_itemGetCPtr( pArg2 ), "MIXED" ) ) hb_set.HB_SET_DIRCASE = HB_SET_CASE_MIXED; else - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else if( HB_IS_NUMERIC( pArg2 ) ) { if( set_number( pArg2, hb_set.HB_SET_DIRCASE ) < 0 ) - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); else hb_set.HB_SET_DIRCASE = set_number( pArg2, hb_set.HB_SET_DIRCASE ); } else - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } break; case HB_SET_DIRSEPARATOR : @@ -859,7 +859,7 @@ HB_FUNC( SET ) { if( set_number( pArg2, hb_set.HB_SET_DBFLOCKSCHEME ) < 0 ) { - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else { @@ -1203,7 +1203,7 @@ HB_EXPORT BOOL hb_setGetL( HB_set_enum set_specifier ) #endif } - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", 0 ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, 0 ); return FALSE; } @@ -1294,7 +1294,7 @@ HB_EXPORT char * hb_setGetCPtr( HB_set_enum set_specifier ) #endif } - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", 0 ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, 0 ); return FALSE; } @@ -1388,7 +1388,7 @@ HB_EXPORT int hb_setGetNI( HB_set_enum set_specifier ) #endif } - hb_errRT_BASE( EG_ARG, 2020, NULL, "SET", 0 ); + hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, 0 ); return FALSE; } diff --git a/harbour/source/rtl/space.c b/harbour/source/rtl/space.c index 503089d3e4..4cc8eae64b 100644 --- a/harbour/source/rtl/space.c +++ b/harbour/source/rtl/space.c @@ -71,7 +71,7 @@ HB_FUNC( SPACE ) /* NOTE: String overflow could never occure since a string can be as large as ULONG_MAX, and the maximum length that can be specified is LONG_MAX here. [vszakats] */ - /* hb_errRT_BASE( EG_STROVERFLOW, 1233, NULL, "SPACE" ); */ + /* hb_errRT_BASE( EG_STROVERFLOW, 1233, NULL, HB_ERR_FUNCNAME ); */ hb_xmemset( szResult, ' ', lLen ); hb_retclen_buffer( szResult, lLen ); @@ -80,5 +80,5 @@ HB_FUNC( SPACE ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1105, NULL, "SPACE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1105, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/str.c b/harbour/source/rtl/str.c index 3f14ebfcca..073041d1a8 100644 --- a/harbour/source/rtl/str.c +++ b/harbour/source/rtl/str.c @@ -84,5 +84,5 @@ HB_FUNC( STR ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "STR", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/strcase.c b/harbour/source/rtl/strcase.c index cab01d04c3..1f95132ac6 100644 --- a/harbour/source/rtl/strcase.c +++ b/harbour/source/rtl/strcase.c @@ -130,7 +130,7 @@ HB_FUNC( LOWER ) hb_retclen_buffer( hb_strLower( pszBuffer, ulLen ), ulLen ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1103, NULL, "LOWER", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1103, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* converts string to upper case */ @@ -146,5 +146,5 @@ HB_FUNC( UPPER ) hb_retclen_buffer( hb_strUpper( pszBuffer, ulLen ), ulLen ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1102, NULL, "UPPER", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1102, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/strpeek.c b/harbour/source/rtl/strpeek.c index ee1c39cc06..b81649d1cd 100644 --- a/harbour/source/rtl/strpeek.c +++ b/harbour/source/rtl/strpeek.c @@ -70,7 +70,7 @@ HB_FUNC( STRPEEK ) hb_retni( 0 ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "STRPEEK", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } @@ -90,7 +90,7 @@ HB_FUNC( STRPOKE ) hb_itemReturn( pText ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "STRPOKE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } #endif /* HB_COMPAT_FLAGSHIP */ diff --git a/harbour/source/rtl/strtran.c b/harbour/source/rtl/strtran.c index 27e0b1dd7f..e224a45590 100644 --- a/harbour/source/rtl/strtran.c +++ b/harbour/source/rtl/strtran.c @@ -191,9 +191,9 @@ HB_FUNC( STRTRAN ) { /* NOTE: Undocumented but existing Clipper Run-time error [vszakats] */ #ifdef HB_C52_STRICT - hb_errRT_BASE_SubstR( EG_ARG, 1126, NULL, "STRTRAN", 0 ); + hb_errRT_BASE_SubstR( EG_ARG, 1126, NULL, HB_ERR_FUNCNAME, 0 ); #else - hb_errRT_BASE_SubstR( EG_ARG, 1126, NULL, "STRTRAN", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1126, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); #endif } } diff --git a/harbour/source/rtl/strzero.c b/harbour/source/rtl/strzero.c index d6e326d3c1..2b074629c8 100644 --- a/harbour/source/rtl/strzero.c +++ b/harbour/source/rtl/strzero.c @@ -121,7 +121,7 @@ HB_FUNC( STRZERO ) by STR(). [vszakats] */ hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "STR", HB_ERR_ARGS_BASEPARAMS ); #else - hb_errRT_BASE_SubstR( EG_ARG, 6003, NULL, "STRZERO", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 6003, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); #endif } } diff --git a/harbour/source/rtl/substr.c b/harbour/source/rtl/substr.c index 1a556c87d6..8ad1550df8 100644 --- a/harbour/source/rtl/substr.c +++ b/harbour/source/rtl/substr.c @@ -91,7 +91,7 @@ HB_FUNC( SUBSTR ) } else { - hb_errRT_BASE_SubstR( EG_ARG, 1110, NULL, "SUBSTR", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1110, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); /* NOTE: Exit from inside [vszakats] */ return; } @@ -113,5 +113,5 @@ HB_FUNC( SUBSTR ) hb_retc( NULL ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1110, NULL, "SUBSTR", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1110, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index c7f3a79473..c19f659930 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -892,5 +892,5 @@ HB_FUNC( TRANSFORM ) /* If there was any parameter error, launch a runtime error */ if( bError ) - hb_errRT_BASE_SubstR( EG_ARG, 1122, NULL, "TRANSFORM", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1122, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/trim.c b/harbour/source/rtl/trim.c index df367d5e6d..555c010010 100644 --- a/harbour/source/rtl/trim.c +++ b/harbour/source/rtl/trim.c @@ -108,7 +108,7 @@ HB_FUNC( LTRIM ) hb_retclen( szText, ulLen ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1101, NULL, "LTRIM", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1101, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* trims trailing spaces from a string */ @@ -177,9 +177,9 @@ HB_FUNC( ALLTRIM ) #ifdef HB_COMPAT_C53 /* NOTE: This runtime error appeared in CA-Cl*pper 5.3 [vszakats] */ #ifdef HB_C52_STRICT - hb_errRT_BASE_SubstR( EG_ARG, 2022, NULL, "ALLTRIM", 0 ); + hb_errRT_BASE_SubstR( EG_ARG, 2022, NULL, HB_ERR_FUNCNAME, 0 ); #else - hb_errRT_BASE_SubstR( EG_ARG, 2022, NULL, "ALLTRIM", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 2022, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); #endif #else hb_retc( NULL ); diff --git a/harbour/source/rtl/type.c b/harbour/source/rtl/type.c index 5ce104f55a..15664452aa 100644 --- a/harbour/source/rtl/type.c +++ b/harbour/source/rtl/type.c @@ -63,6 +63,5 @@ HB_FUNC( TYPE ) hb_memvarUpdatePrivatesBase(); } else - hb_errRT_BASE_SubstR( EG_ARG, 1121, NULL, "TYPE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1121, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } - diff --git a/harbour/source/rtl/val.c b/harbour/source/rtl/val.c index 8bc7b0d2c0..62db2cfb1c 100644 --- a/harbour/source/rtl/val.c +++ b/harbour/source/rtl/val.c @@ -75,5 +75,5 @@ HB_FUNC( VAL ) hb_retnlen( dValue, iWidth, iDec ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1098, NULL, "VAL", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1098, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/valtype.c b/harbour/source/rtl/valtype.c index ba87504ec5..7fb6f1a159 100644 --- a/harbour/source/rtl/valtype.c +++ b/harbour/source/rtl/valtype.c @@ -173,5 +173,5 @@ HB_FUNC( HB_ISNULL ) return; } } - hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, "HB_ISNULL", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1111, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/rtl/word.c b/harbour/source/rtl/word.c index 1143afd768..1e54242b4b 100644 --- a/harbour/source/rtl/word.c +++ b/harbour/source/rtl/word.c @@ -62,5 +62,5 @@ HB_FUNC( WORD ) if( ISNUM( 1 ) ) hb_retni( hb_parni( 1 ) ); else - hb_errRT_BASE( EG_ARG, 1091, NULL, "WORD", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1091, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/source/vm/arrayshb.c b/harbour/source/vm/arrayshb.c index a5a620e16b..690b76eaf1 100644 --- a/harbour/source/vm/arrayshb.c +++ b/harbour/source/vm/arrayshb.c @@ -124,10 +124,10 @@ HB_FUNC( AADD ) if( pValue && hb_arrayAdd( pArray, pValue ) ) hb_itemReturn( pValue ); else - hb_errRT_BASE( EG_BOUND, 1187, NULL, "AADD", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_BOUND, 1187, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, "AADD", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_ARRAYID ) /* for debugging: returns the array's "address" so dual references to same array can be seen */ @@ -159,9 +159,9 @@ HB_FUNC( ASIZE ) #ifdef HB_COMPAT_C53 /* From CA-Cl*pper 5.3a */ else #ifdef HB_C52_STRICT - hb_errRT_BASE( EG_ARG, 2023, NULL, "ASIZE", 0 ); + hb_errRT_BASE( EG_ARG, 2023, NULL, HB_ERR_FUNCNAME, 0 ); #else - hb_errRT_BASE( EG_ARG, 2023, NULL, "ASIZE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2023, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); #endif #endif } @@ -256,7 +256,7 @@ HB_FUNC( AFILL ) thrown by AEVAL(). [vszakats] */ hb_errRT_BASE( EG_ARG, 2017, NULL, "AEVAL", 0 ); #else - hb_errRT_BASE( EG_ARG, 6004, NULL, "AFILL", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 6004, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); #endif } @@ -387,7 +387,7 @@ HB_FUNC( AEVAL ) hb_itemReturn( hb_stackItemFromBase( 1 ) ); /* AEval() returns the array itself */ } else - hb_errRT_BASE( EG_ARG, 2017, NULL, "AEVAL", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2017, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( ACOPY ) diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c index ebf9aaa937..c7ca9223d7 100644 --- a/harbour/source/vm/classes.c +++ b/harbour/source/vm/classes.c @@ -616,7 +616,7 @@ static BOOL hb_clsCanClearMethod( PMETHOD pMethod, BOOL fError ) if( pMethod->pFuncSym == &s___msgSuper ) { if( fError ) - hb_errRT_BASE( EG_ARG, 3000, "Cannot delete supercast messages", &hb_errFuncName, 0 ); + hb_errRT_BASE( EG_ARG, 3000, "Cannot delete supercast messages", HB_ERR_FUNCNAME, 0 ); return FALSE; } #endif @@ -2194,9 +2194,7 @@ HB_EXPORT PHB_ITEM hb_objSendMessage( PHB_ITEM pObject, PHB_DYNS pMsgSym, ULONG hb_vmSend( (USHORT) ulArg ); } else - { hb_errRT_BASE( EG_ARG, 3000, NULL, "__ObjSendMessage()", 0 ); - } return hb_stackReturnItem(); } @@ -2647,7 +2645,7 @@ static BOOL hb_clsAddMsg( USHORT uiClass, const char * szMessage, if( !fOK ) { - hb_errRT_BASE( EG_ARG, 3000, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3000, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); return FALSE; } @@ -3223,7 +3221,7 @@ HB_FUNC( __CLSNEW ) hb_retni( uiClass ); } else - hb_errRT_BASE( EG_ARG, 3000, NULL, "__CLSNEW", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3000, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -3378,14 +3376,14 @@ HB_FUNC( __CLSMODMSG ) if( pFuncSym == &s___msgSetData || pFuncSym == &s___msgGetData ) { - hb_errRT_BASE( EG_ARG, 3004, "Cannot modify a DATA item", "__CLSMODMSG", 0 ); + hb_errRT_BASE( EG_ARG, 3004, "Cannot modify a DATA item", HB_ERR_FUNCNAME, 0 ); } else if( pFuncSym == &s___msgEvalInline ) { PHB_ITEM pBlock = hb_param( 3, HB_IT_BLOCK ); if( pBlock == NULL ) - hb_errRT_BASE( EG_ARG, 3000, "Cannot modify INLINE method", "__CLSMODMSG", 0 ); + hb_errRT_BASE( EG_ARG, 3000, "Cannot modify INLINE method", HB_ERR_FUNCNAME, 0 ); else hb_arraySet( s_pClasses[ pMethod->uiSprClass ].pInlines, pMethod->uiData, pBlock ); @@ -3395,7 +3393,7 @@ HB_FUNC( __CLSMODMSG ) pFuncSym = hb_objGetFuncSym( hb_param( 3, HB_IT_ANY ) ); if( pFuncSym == NULL ) - hb_errRT_BASE( EG_ARG, 3000, NULL, "__CLSMODMSG", 0 ); + hb_errRT_BASE( EG_ARG, 3000, NULL, HB_ERR_FUNCNAME, 0 ); else pMethod->pFuncSym = pFuncSym; } @@ -3436,7 +3434,7 @@ HB_FUNC( __OBJHASMSG ) if( pMessage ) hb_retl( hb_objHasMessage( hb_param( 1, HB_IT_ANY ), pMessage ) ); else - hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "__OBJHASMSG", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* @@ -3464,7 +3462,7 @@ HB_FUNC( __OBJSENDMSG ) } else { - hb_errRT_BASE( EG_ARG, 3000, NULL, "__OBJSENDMSG", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 3000, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } } @@ -3485,7 +3483,7 @@ HB_FUNC( __OBJCLONE ) } else { - hb_errRT_BASE( EG_ARG, 3001, NULL, "__OBJCLONE", 0 ); + hb_errRT_BASE( EG_ARG, 3001, NULL, HB_ERR_FUNCNAME, 0 ); } } @@ -3557,14 +3555,12 @@ HB_FUNC( __CLSINSTSUPER ) if( uiClassH && HB_IS_OBJECT( pObject ) ) pObject->item.asArray.value->uiClass = 0; else if( hb_vmRequestQuery() == 0 ) - hb_errRT_BASE( EG_ARG, 3002, "Super class does not return an object", "__CLSINSTSUPER", 0 ); + hb_errRT_BASE( EG_ARG, 3002, "Super class does not return an object", HB_ERR_FUNCNAME, 0 ); } } } else - { - hb_errRT_BASE( EG_ARG, 3003, "Cannot find super class", "__CLSINSTSUPER", 0 ); - } + hb_errRT_BASE( EG_ARG, 3003, "Cannot find super class", HB_ERR_FUNCNAME, 0 ); hb_retni( uiClassH ); } diff --git a/harbour/source/vm/debug.c b/harbour/source/vm/debug.c index 44306ca212..f3f4e07f3d 100644 --- a/harbour/source/vm/debug.c +++ b/harbour/source/vm/debug.c @@ -230,7 +230,7 @@ HB_FUNC( HB_DBG_VMVARLGET ) if( pLocal ) hb_itemReturn( pLocal ); else - hb_errRT_BASE( EG_ARG, 6005, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 6005, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_DBG_VMVARLSET ) diff --git a/harbour/source/vm/eval.c b/harbour/source/vm/eval.c index 79f0c3c080..9548e11a5a 100644 --- a/harbour/source/vm/eval.c +++ b/harbour/source/vm/eval.c @@ -499,7 +499,7 @@ HB_FUNC( HB_EXECFROMARRAY ) hb_vmDo( usPCount ); } else - hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "HB_EXECFROMARRAY", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } BOOL hb_execFromArray( PHB_ITEM pParam ) @@ -564,6 +564,7 @@ BOOL hb_execFromArray( PHB_ITEM pParam ) } } - hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "HB_EXECFROMARRAY", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); + return FALSE; } diff --git a/harbour/source/vm/evalhb.c b/harbour/source/vm/evalhb.c index a32f7e84ff..c3c3d21908 100644 --- a/harbour/source/vm/evalhb.c +++ b/harbour/source/vm/evalhb.c @@ -81,7 +81,6 @@ HB_FUNC( EVAL ) } else { - hb_errRT_BASE_SubstR( EG_NOMETHOD, 1004, NULL, "EVAL", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE_SubstR( EG_NOMETHOD, 1004, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } } - diff --git a/harbour/source/vm/hashfunc.c b/harbour/source/vm/hashfunc.c index 0c82cd9cc2..9a9ccbbda9 100644 --- a/harbour/source/vm/hashfunc.c +++ b/harbour/source/vm/hashfunc.c @@ -91,7 +91,7 @@ HB_FUNC( HB_HHASKEY ) if( pHash && pKey ) hb_retl( hb_hashScan( pHash, pKey, NULL ) ); else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HPOS ) @@ -106,7 +106,7 @@ HB_FUNC( HB_HPOS ) hb_retnint( ulPos ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HGET ) @@ -123,7 +123,7 @@ HB_FUNC( HB_HGET ) hb_errRT_BASE( EG_BOUND, 1132, NULL, hb_langDGetErrorDesc( EG_ARRACCESS ), 2, pHash, pKey ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HSET ) @@ -135,7 +135,7 @@ HB_FUNC( HB_HSET ) if( pHash && pKey && pValue ) hb_hashAdd( pHash, pKey, pValue ); else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HDEL ) @@ -149,7 +149,7 @@ HB_FUNC( HB_HDEL ) hb_errRT_BASE( EG_BOUND, 1133, NULL, hb_langDGetErrorDesc( EG_ARRASSIGN ), 2, pHash, pKey ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HKEYAT ) @@ -163,10 +163,10 @@ HB_FUNC( HB_HKEYAT ) if( pKey ) hb_itemReturn( pKey ); else - hb_errRT_BASE( EG_BOUND, 1187, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_BOUND, 1187, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HVALUEAT ) @@ -187,10 +187,10 @@ HB_FUNC( HB_HVALUEAT ) hb_itemReturn( pValue ); } else - hb_errRT_BASE( EG_BOUND, 1187, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_BOUND, 1187, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HPAIRAT ) @@ -220,10 +220,10 @@ HB_FUNC( HB_HPAIRAT ) } } else - hb_errRT_BASE( EG_BOUND, 1187, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_BOUND, 1187, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HDELAT ) @@ -237,7 +237,7 @@ HB_FUNC( HB_HDELAT ) hb_errRT_BASE( EG_BOUND, 1133, NULL, hb_langDGetErrorDesc( EG_ARRASSIGN ), 2, pHash, pPos ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } @@ -248,7 +248,7 @@ HB_FUNC( HB_HKEYS ) if( pHash ) hb_itemReturnRelease( hb_hashGetKeys( pHash ) ); else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HVALUES ) @@ -258,7 +258,7 @@ HB_FUNC( HB_HVALUES ) if( pHash ) hb_itemReturnRelease( hb_hashGetValues( pHash ) ); else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HFILL ) @@ -277,7 +277,7 @@ HB_FUNC( HB_HFILL ) hb_itemReturn( pHash ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HCLONE ) @@ -287,7 +287,7 @@ HB_FUNC( HB_HCLONE ) if( pHash ) hb_itemReturnRelease( hb_hashClone( pHash ) ); else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HCOPY ) @@ -318,7 +318,7 @@ HB_FUNC( HB_HCOPY ) hb_itemReturn( pDest ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HMERGE ) @@ -358,7 +358,7 @@ HB_FUNC( HB_HMERGE ) hb_itemReturn( pDest ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HEVAL ) @@ -396,7 +396,7 @@ HB_FUNC( HB_HEVAL ) hb_itemReturn( pHash ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HSCAN ) @@ -594,7 +594,7 @@ HB_FUNC( HB_HSCAN ) hb_retnint( fFound ? ulStart : 0 ); } else - hb_errRT_BASE( EG_ARG, 1123, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 1123, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HCASEMATCH ) @@ -614,7 +614,7 @@ HB_FUNC( HB_HCASEMATCH ) } } else - hb_errRT_BASE( EG_ARG, 2017, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2017, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HAUTOADD ) @@ -647,7 +647,7 @@ HB_FUNC( HB_HAUTOADD ) } } else - hb_errRT_BASE( EG_ARG, 2017, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2017, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HALLOCATE ) @@ -662,7 +662,7 @@ HB_FUNC( HB_HALLOCATE ) hb_hashPreallocate( pHash, lMem ); } else - hb_errRT_BASE( EG_ARG, 2017, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2017, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HDEFAULT ) @@ -676,7 +676,7 @@ HB_FUNC( HB_HDEFAULT ) hb_hashSetDefault( pHash, hb_param( 2, HB_IT_ANY ) ); } else - hb_errRT_BASE( EG_ARG, 2017, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2017, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( HB_HSETAUTOADD ) { HB_FUNC_EXEC( HB_HAUTOADD ); hb_itemReturn( hb_param( 1, HB_IT_HASH ) ); } diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c index d8211f296b..76b2cfb172 100644 --- a/harbour/source/vm/memvars.c +++ b/harbour/source/vm/memvars.c @@ -1431,7 +1431,7 @@ HB_FUNC( __MVSAVE ) } else /* NOTE: Undocumented error message in CA-Cl*pper 5.2e and 5.3x. [ckedem] */ - hb_errRT_BASE( EG_ARG, 2008, NULL, "__MSAVE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2008, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* NOTE: There's an extension in Harbour, which makes it possible to only @@ -1594,7 +1594,7 @@ HB_FUNC( __MVRESTORE ) } else /* NOTE: Undocumented error message in CA-Cl*pper 5.2e and 5.3x. [ckedem] */ - hb_errRT_BASE( EG_ARG, 2007, NULL, "__MRESTORE", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 2007, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } /* diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c index bc67e39f0a..9f2e61436e 100644 --- a/harbour/source/vm/runner.c +++ b/harbour/source/vm/runner.c @@ -316,7 +316,7 @@ static PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ) if( iVersion == 0 ) { - hb_errRT_BASE( EG_CORRUPTION, 9995, NULL, "__HRBLOAD", 0 ); + hb_errRT_BASE( EG_CORRUPTION, 9995, NULL, HB_ERR_FUNCNAME, 0 ); return NULL; } @@ -333,7 +333,7 @@ static PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ) pHrbBody->ulSymbols == 0 ) { hb_hrbUnLoad( pHrbBody ); - hb_errRT_BASE( EG_CORRUPTION, 9996, NULL, "__HRBLOAD", 0 ); + hb_errRT_BASE( EG_CORRUPTION, 9996, NULL, HB_ERR_FUNCNAME, 0 ); return NULL; } @@ -362,7 +362,7 @@ static PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ) { hb_hrbFreeSymbols( pSymRead, ul ); hb_hrbUnLoad( pHrbBody ); - hb_errRT_BASE( EG_CORRUPTION, 9997, NULL, "__HRBLOAD", 0 ); + hb_errRT_BASE( EG_CORRUPTION, 9997, NULL, HB_ERR_FUNCNAME, 0 ); return NULL; } @@ -400,7 +400,7 @@ static PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ) { hb_hrbFreeSymbols( pSymRead, pHrbBody->ulSymbols ); hb_hrbUnLoad( pHrbBody ); - hb_errRT_BASE( EG_CORRUPTION, 9998, NULL, "__HRBLOAD", 0 ); + hb_errRT_BASE( EG_CORRUPTION, 9998, NULL, HB_ERR_FUNCNAME, 0 ); return NULL; } } @@ -612,7 +612,7 @@ HB_FUNC( __HRBRUN ) hb_retl( FALSE ); } else - hb_errRT_BASE( EG_ARG, 6103, NULL, "__HRBRUN", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 6103, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( __HRBLOAD ) @@ -651,7 +651,7 @@ HB_FUNC( __HRBLOAD ) hb_retptr( ( void *) pHrbBody ); } else - hb_errRT_BASE( EG_ARG, 9998, NULL, "__HRBLOAD", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 9998, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( __HRBDO ) @@ -678,7 +678,7 @@ HB_FUNC( __HRBDO ) hb_xfree( argv ); } else - hb_errRT_BASE( EG_ARG, 6104, NULL, "__HRBDO", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 6104, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( __HRBUNLOAD ) @@ -688,7 +688,7 @@ HB_FUNC( __HRBUNLOAD ) if( pHrbBody ) hb_hrbUnLoad( pHrbBody ); else - hb_errRT_BASE( EG_ARG, 6105, NULL, "__HRBUNLOAD", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 6105, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( __HRBGETFU ) @@ -712,7 +712,7 @@ HB_FUNC( __HRBGETFU ) hb_itemPutSymbol( hb_stackReturnItem(), pHrbBody->pSymRead + ulPos ); } else - hb_errRT_BASE( EG_ARG, 6106, NULL, "__HRBGETFU", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 6106, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } HB_FUNC( __HRBDOFU ) @@ -733,5 +733,5 @@ HB_FUNC( __HRBDOFU ) hb_vmDo( argc - 1 ); /* Run function */ } else - hb_errRT_BASE( EG_ARG, 6107, NULL, "__HRBDOFU", HB_ERR_ARGS_BASEPARAMS ); + hb_errRT_BASE( EG_ARG, 6107, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); }