From ae5075fa5bf32f668345e61870eacf7930326911 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sun, 9 Nov 2008 23:20:16 +0000 Subject: [PATCH] 2008-11-10 00:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/rules.cf ! fixed recursive HB_FLAGS declaration * harbour/include/hbdefs.h * harbour/include/hbsetup.h * harbour/include/hbtrace.h * declared hb_tr_trace() parameters as printf() compatible in GCC builds. It enabled format string with parameters validation * harbour/source/rtl/errorapi.c ! fixed GPF caused by HB_ERR_FUNCNAME which is not longer valid string * harbour/source/vm/itemapi.c * harbour/source/vm/hvm.c * harbour/source/vm/arrays.c * harbour/source/vm/memvars.c * harbour/source/vm/eval.c * harbour/source/vm/extend.c * harbour/source/vm/set.c * harbour/source/debug/dbgentry.c * harbour/source/rtl/gtwin/gtwin.c * harbour/source/rtl/gtxwc/gtxwc.c * harbour/source/rtl/hbgtcore.c * harbour/source/rtl/gtcrs/gtcrs.c * harbour/source/rtl/gtstd/gtstd.c * harbour/source/rtl/gtsln/gtsln.c * harbour/source/rtl/gttrm/gttrm.c * harbour/source/rtl/gtpca/gtpca.c * harbour/source/rtl/gtcgi/gtcgi.c * harbour/source/rtl/gtwvt/gtwvt.c * harbour/source/rtl/filesys.c * harbour/source/rdd/dbf1.c * harbour/source/rdd/dbffpt/dbffpt1.c * harbour/contrib/gtalleg/gtalleg.c * harbour/contrib/xhb/freadlin.c * harbour/contrib/gtwvg/gtwvg.c * harbour/contrib/rddads/adsfunc.c * harbour/contrib/rddads/ads1.c * harbour/contrib/hbwin/win_ole.c * harbour/utils/hbdoc/hbdfrdln.c * harbour/utils/hbmake/hbmfrdln.c ! fixed bugs in HB_TRACE massages reported in GCC builds --- harbour/ChangeLog | 45 +++++++++++++++++++++++++++++ harbour/config/rules.cf | 2 +- harbour/contrib/gtalleg/gtalleg.c | 2 +- harbour/contrib/gtwvg/gtwvg.c | 2 +- harbour/contrib/hbwin/win_ole.c | 10 +++---- harbour/contrib/rddads/ads1.c | 4 +-- harbour/contrib/rddads/adsfunc.c | 2 +- harbour/contrib/xhb/freadlin.c | 2 +- harbour/include/hbdefs.h | 7 ----- harbour/include/hbsetup.h | 8 +++++ harbour/include/hbtrace.h | 2 +- harbour/source/debug/dbgentry.c | 2 +- harbour/source/rdd/dbf1.c | 2 +- harbour/source/rdd/dbffpt/dbffpt1.c | 8 ++--- harbour/source/rtl/errorapi.c | 4 +-- harbour/source/rtl/filesys.c | 36 +++++++++++------------ harbour/source/rtl/gtcgi/gtcgi.c | 2 +- harbour/source/rtl/gtcrs/gtcrs.c | 2 +- harbour/source/rtl/gtpca/gtpca.c | 2 +- harbour/source/rtl/gtsln/gtsln.c | 2 +- harbour/source/rtl/gtstd/gtstd.c | 2 +- harbour/source/rtl/gttrm/gttrm.c | 2 +- harbour/source/rtl/gtwin/gtwin.c | 2 +- harbour/source/rtl/gtwvt/gtwvt.c | 2 +- harbour/source/rtl/gtxwc/gtxwc.c | 2 +- harbour/source/rtl/hbgtcore.c | 2 +- harbour/source/vm/arrays.c | 2 +- harbour/source/vm/eval.c | 4 +-- harbour/source/vm/extend.c | 2 +- harbour/source/vm/hvm.c | 12 ++++---- harbour/source/vm/itemapi.c | 2 +- harbour/source/vm/memvars.c | 2 +- harbour/source/vm/set.c | 4 +-- harbour/utils/hbdoc/hbdfrdln.c | 2 +- harbour/utils/hbmake/hbmfrdln.c | 2 +- 35 files changed, 118 insertions(+), 72 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 06bf627547..8215067a3c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,51 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-10 00:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/rules.cf + ! fixed recursive HB_FLAGS declaration + + * harbour/include/hbdefs.h + * harbour/include/hbsetup.h + * harbour/include/hbtrace.h + * declared hb_tr_trace() parameters as printf() compatible in GCC + builds. It enabled format string with parameters validation + + * harbour/source/rtl/errorapi.c + ! fixed GPF caused by HB_ERR_FUNCNAME which is not longer valid + string + + * harbour/source/vm/itemapi.c + * harbour/source/vm/hvm.c + * harbour/source/vm/arrays.c + * harbour/source/vm/memvars.c + * harbour/source/vm/eval.c + * harbour/source/vm/extend.c + * harbour/source/vm/set.c + * harbour/source/debug/dbgentry.c + * harbour/source/rtl/gtwin/gtwin.c + * harbour/source/rtl/gtxwc/gtxwc.c + * harbour/source/rtl/hbgtcore.c + * harbour/source/rtl/gtcrs/gtcrs.c + * harbour/source/rtl/gtstd/gtstd.c + * harbour/source/rtl/gtsln/gtsln.c + * harbour/source/rtl/gttrm/gttrm.c + * harbour/source/rtl/gtpca/gtpca.c + * harbour/source/rtl/gtcgi/gtcgi.c + * harbour/source/rtl/gtwvt/gtwvt.c + * harbour/source/rtl/filesys.c + * harbour/source/rdd/dbf1.c + * harbour/source/rdd/dbffpt/dbffpt1.c + * harbour/contrib/gtalleg/gtalleg.c + * harbour/contrib/xhb/freadlin.c + * harbour/contrib/gtwvg/gtwvg.c + * harbour/contrib/rddads/adsfunc.c + * harbour/contrib/rddads/ads1.c + * harbour/contrib/hbwin/win_ole.c + * harbour/utils/hbdoc/hbdfrdln.c + * harbour/utils/hbmake/hbmfrdln.c + ! fixed bugs in HB_TRACE massages reported in GCC builds + 2008-11-09 20:58 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbdefs.h * include/hbapigt.h diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf index 09f3d06cb3..9364871f2b 100644 --- a/harbour/config/rules.cf +++ b/harbour/config/rules.cf @@ -20,7 +20,7 @@ HB := $(HB_BIN_COMPILE)/ endif HB := $(HB)harbour$(EXE_EXT) -HB_FLAGS = -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc3 -km -l $(HB_FLAGS) +HB_FLAGS := -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc3 -km -l $(HB_FLAGS) # The rule to link an executable. ifeq ($(LD_RULE),) diff --git a/harbour/contrib/gtalleg/gtalleg.c b/harbour/contrib/gtalleg/gtalleg.c index 5d269c9518..2ea02c283a 100644 --- a/harbour/contrib/gtalleg/gtalleg.c +++ b/harbour/contrib/gtalleg/gtalleg.c @@ -547,7 +547,7 @@ static void hb_gt_alleg_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hF { int iRet; - HB_TRACE(HB_TR_DEBUG, ("hb_gt_alleg_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_alleg_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr)); ssfCreateThinFont( &s_ssfDefaultFont ); diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 7255e2b7f9..2aa00e6c59 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -2072,7 +2072,7 @@ static void hb_gt_wvt_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil int iCmdShow; PHB_GTWVT pWVT; - HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr ) ); + HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) ); if( ! hb_winmainArgGet( &hInstance, NULL, &iCmdShow ) ) hb_errInternal( 10001, "It's not a GUI program", NULL, NULL ); diff --git a/harbour/contrib/hbwin/win_ole.c b/harbour/contrib/hbwin/win_ole.c index 7f449c32ee..94e628ed30 100644 --- a/harbour/contrib/hbwin/win_ole.c +++ b/harbour/contrib/hbwin/win_ole.c @@ -563,7 +563,7 @@ ItemToVariant_StringArray: break; default: - HB_TRACE(HB_TR_INFO, ("Unexpected VT type %p in: %s(%i)!\n", pVariant->n1.n2.vt, __FILE__, __LINE__)); + HB_TRACE(HB_TR_INFO, ("Unexpected VT type %p in: %s(%i)!\n", ( void * ) ( HB_PTRDIFF ) pVariant->n1.n2.vt, __FILE__, __LINE__)); } break; @@ -840,7 +840,7 @@ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) } else { - HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", pVariant->n1.n2.vt, __FILE__, __LINE__)); + HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", ( void * ) ( HB_PTRDIFF ) pVariant->n1.n2.vt, __FILE__, __LINE__)); } } } @@ -848,7 +848,7 @@ static void FreeParams( DISPPARAMS *pDispParams, PHB_ITEM *aPrgParams ) { if( pVariant->n1.n2.vt & VT_BYREF ) { - HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", pVariant->n1.n2.vt, __FILE__, __LINE__)); + HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", ( void * ) ( HB_PTRDIFF ) pVariant->n1.n2.vt, __FILE__, __LINE__)); } } @@ -1244,7 +1244,7 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ) } else { - HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", pVariant->n1.n2.vt, __FILE__, __LINE__)); + HB_TRACE(HB_TR_INFO, ("Unexpected type %p in: %s(%i)!\n", ( void * ) ( HB_PTRDIFF ) pVariant->n1.n2.vt, __FILE__, __LINE__)); return E_FAIL; } } @@ -1336,7 +1336,7 @@ static char * Ole2TxtError( void ) case MK_E_UNAVAILABLE: return "MK_E_UNAVAILABLE"; } - HB_TRACE(HB_TR_INFO, ("TOleAuto Error %p\n", s_nOleError)); + HB_TRACE(HB_TR_INFO, ("TOleAuto Error %p\n", ( void * ) ( HB_PTRDIFF ) s_nOleError)); return "Unknown error"; } diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index df75eecf36..ebb0d8df44 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -671,7 +671,7 @@ ERRCODE hb_adsCloseCursor( ADSAREAP pArea ) if( u32RetVal != AE_SUCCESS ) { - HB_TRACE(HB_TR_DEBUG, ("adsCloseTable(%lu, %s) failed", u32RetVal, pArea->szDataFileName)); + HB_TRACE(HB_TR_DEBUG, ("adsCloseTable(%lu, %s) failed", ( ULONG ) u32RetVal, pArea->szDataFileName)); } pArea->hTable = 0; } @@ -3190,7 +3190,7 @@ static ERRCODE adsSysName( ADSAREAP pArea, BYTE * pBuffer ) u32RetVal = AdsGetTableType( pArea->hTable, &u16TableType ); if( u32RetVal != AE_SUCCESS ) { - HB_TRACE(HB_TR_DEBUG, ("Error in adsSysName: %d pArea->hTable %d\n", u32RetVal, pArea->hTable)); + HB_TRACE(HB_TR_DEBUG, ("Error in adsSysName: %lu pArea->hTable %p\n", ( ULONG ) u32RetVal, ( void * ) ( HB_PTRDIFF ) pArea->hTable)); u16TableType = ( UNSIGNED16 ) pArea->iFileType; } } diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c index 35f29c431b..6e5e6f0d4f 100644 --- a/harbour/contrib/rddads/adsfunc.c +++ b/harbour/contrib/rddads/adsfunc.c @@ -966,7 +966,7 @@ HB_FUNC( ADSGETFILTER ) } else { - HB_TRACE(HB_TR_DEBUG, ("adsGetFilter() error %lu", ulRetVal)); + HB_TRACE(HB_TR_DEBUG, ("adsGetFilter() error %lu", ( ULONG ) ulRetVal)); hb_retc( NULL ); } diff --git a/harbour/contrib/xhb/freadlin.c b/harbour/contrib/xhb/freadlin.c index 3b053ad14a..3a15598d93 100644 --- a/harbour/contrib/xhb/freadlin.c +++ b/harbour/contrib/xhb/freadlin.c @@ -67,7 +67,7 @@ BYTE * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, char ** Term, in LONG lRead = 0, lOffset, lSize; BYTE * pBuff; - HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %hu, %i, %i)", hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); + HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %hu, %i, %i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); *bFound = FALSE; *bEOF = FALSE; diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index e95926aa18..570c2da3e1 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -1237,13 +1237,6 @@ typedef PHB_FUNC HB_FUNC_PTR; #endif -#if defined( __GNUC__ ) - #define HB_PRINTF_FORMAT( _nStr, _nParam ) \ - __attribute__ (( format (printf, _nStr, _nParam))) -#else - #define HB_PRINTF_FORMAT( _nStr, _nParam ) -#endif - /* Function declaration macros */ /* NOTE: The prefix is "HB_FUN_" currently, this is needed to diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 26b7a51d24..6e8c0e3cfe 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -414,4 +414,12 @@ #define HB_EXTERN_END #endif +#if defined( __GNUC__ ) + #define HB_PRINTF_FORMAT( _nStr, _nParam ) \ + __attribute__ (( format (printf, _nStr, _nParam))) +#else + #define HB_PRINTF_FORMAT( _nStr, _nParam ) +#endif + + #endif /* HB_SETUP_H_ */ diff --git a/harbour/include/hbtrace.h b/harbour/include/hbtrace.h index 3103951879..89fa5a2a32 100644 --- a/harbour/include/hbtrace.h +++ b/harbour/include/hbtrace.h @@ -220,7 +220,7 @@ extern int hb_tracestate( int new_state ); extern int hb_tracelevel( int new_level ); extern int hb_tr_level( void ); -extern void hb_tr_trace( const char * fmt, ... ); +extern void hb_tr_trace( const char * fmt, ... ) HB_PRINTF_FORMAT( 1, 2 ); HB_EXTERN_END diff --git a/harbour/source/debug/dbgentry.c b/harbour/source/debug/dbgentry.c index 2edb0a4898..b241aa4822 100644 --- a/harbour/source/debug/dbgentry.c +++ b/harbour/source/debug/dbgentry.c @@ -507,7 +507,7 @@ void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, int nFrame ) if ( info->bQuit ) return; - HB_TRACE( HB_TR_DEBUG, ( "ENDPROC", nLine ) ); + HB_TRACE( HB_TR_DEBUG, ( "ENDPROC %d", nLine ) ); if ( info->bInitLines ) { diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 823c7be4d6..71ea0ab266 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -701,7 +701,7 @@ static ERRCODE hb_dbfUnlockAllRecords( DBFAREAP pArea ) { ERRCODE uiError = SUCCESS; - HB_TRACE(HB_TR_DEBUG, ("hb_dbfUnlockAllRecords(%p, %p)", pArea )); + HB_TRACE(HB_TR_DEBUG, ("hb_dbfUnlockAllRecords(%p)", pArea )); if( pArea->pLocksPos ) { diff --git a/harbour/source/rdd/dbffpt/dbffpt1.c b/harbour/source/rdd/dbffpt/dbffpt1.c index a4a03ad1dc..d846b9f433 100644 --- a/harbour/source/rdd/dbffpt/dbffpt1.c +++ b/harbour/source/rdd/dbffpt/dbffpt1.c @@ -2599,7 +2599,7 @@ static ERRCODE hb_fptGetMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem, BYTE * pBuffer, * bMemoBuf; FPTBLOCK fptBlock; - HB_TRACE(HB_TR_DEBUG, ("hb_fptGetMemo(%p, %hu, %p, %p, %lu, %lu)", pArea, uiIndex, pItem, hFile, ulStart, ulCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_fptGetMemo(%p, %hu, %p, %p, %lu, %lu)", pArea, uiIndex, pItem, ( void * ) ( HB_PTRDIFF ) hFile, ulStart, ulCount)); if( uiIndex ) { @@ -2825,8 +2825,8 @@ static ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize, ERRCODE errCode; BOOL bWrite; - HB_TRACE(HB_TR_DEBUG, ("hb_fptWriteMemo(%p, %lu, %lu, %p, %p, %hu, %lu, %p)", - pArea, ulBlock, ulSize, bBufPtr, hFile, ulType, ulLen, ulStoredBlock)); + HB_TRACE(HB_TR_DEBUG, ("hb_fptWriteMemo(%p, %lu, %lu, %p, %p, %lu, %lu, %p)", + pArea, ulBlock, ulSize, bBufPtr, ( void * ) ( HB_PTRDIFF ) hFile, ulType, ulLen, ulStoredBlock)); bWrite = ( ulLen != 0 || ( pArea->bMemoType == DB_MEMO_FPT && ulType != FPTIT_TEXT && ulType != FPTIT_BINARY && @@ -3258,7 +3258,7 @@ static ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem BYTE * pFieldBuf; BOOL fUnLock = FALSE; - HB_TRACE(HB_TR_DEBUG, ("hb_fptGetVarField(%p, %hu, %p, %p)", pArea, uiIndex, pItem, hFile)); + HB_TRACE(HB_TR_DEBUG, ("hb_fptGetVarField(%p, %hu, %p, %p)", pArea, uiIndex, pItem, ( void * ) ( HB_PTRDIFF ) hFile)); pField = pArea->lpFields + uiIndex - 1; diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c index a6ac9948f9..621a269bb7 100644 --- a/harbour/source/rtl/errorapi.c +++ b/harbour/source/rtl/errorapi.c @@ -791,7 +791,7 @@ char * hb_errGetOperation( PHB_ITEM pError ) PHB_ITEM hb_errPutOperation( PHB_ITEM pError, const char * szOperation ) { - HB_TRACE(HB_TR_DEBUG, ("hb_errPutOperation(%p, %s)", pError, szOperation)); + HB_TRACE(HB_TR_DEBUG, ("hb_errPutOperation(%p, %s)", pError, szOperation == HB_ERR_FUNCNAME ? "HB_ERR_FUNCNAME" : szOperation)); if( szOperation == HB_ERR_FUNCNAME ) { @@ -908,7 +908,7 @@ PHB_ITEM hb_errPutArgs( PHB_ITEM pError, ULONG ulArgCount, ... ) ULONG ulArgPos; va_list va; - HB_TRACE(HB_TR_DEBUG, ("hb_errPutArgs(%p, %hu, ...)", pError, ulArgCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_errPutArgs(%p, %lu, ...)", pError, ulArgCount)); pArray = hb_itemArrayNew( ulArgCount ); diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 60da8bb9a1..4eaf7119c9 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -538,7 +538,7 @@ static USHORT convert_seek_flags( USHORT uiFlags ) HB_FHANDLE hb_fsGetOsHandle( HB_FHANDLE hFileHandle ) { - HB_TRACE(HB_TR_DEBUG, ("hb_fsGetOsHandle(%p)", hFileHandle)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsGetOsHandle(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); #if defined(HB_IO_WIN) return ( HB_FHANDLE ) DosToWinHandle( hFileHandle ); @@ -826,7 +826,7 @@ HB_FHANDLE hb_fsCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFlags ) void hb_fsClose( HB_FHANDLE hFileHandle ) { - HB_TRACE(HB_TR_DEBUG, ("hb_fsClose(%p)", hFileHandle)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsClose(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); #if defined(HB_FS_FILE_IO) @@ -847,7 +847,7 @@ void hb_fsClose( HB_FHANDLE hFileHandle ) BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) { - HB_TRACE(HB_TR_DEBUG, ("hb_fsSetDevMode(%p, %hu)", hFileHandle, uiDevMode)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsSetDevMode(%p, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, uiDevMode)); /* TODO: HB_IO_WIN support */ @@ -1364,7 +1364,7 @@ USHORT hb_fsRead( HB_FHANDLE hFileHandle, BYTE * pBuff, USHORT uiCount ) { USHORT uiRead; - HB_TRACE(HB_TR_DEBUG, ("hb_fsRead(%p, %p, %hu)", hFileHandle, pBuff, uiCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsRead(%p, %p, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, uiCount)); #if defined(HB_FS_FILE_IO) @@ -1404,7 +1404,7 @@ USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const BYTE * pBuff, USHORT uiCount ) { USHORT uiWritten; - HB_TRACE(HB_TR_DEBUG, ("hb_fsWrite(%p, %p, %hu)", hFileHandle, pBuff, uiCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsWrite(%p, %p, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, uiCount)); #if defined(HB_FS_FILE_IO) @@ -1464,7 +1464,7 @@ ULONG hb_fsReadLarge( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount ) { ULONG ulRead; - HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLarge(%p, %p, %lu)", hFileHandle, pBuff, ulCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLarge(%p, %p, %lu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount)); #if defined(HB_FS_FILE_IO) @@ -1544,7 +1544,7 @@ ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount { ULONG ulWritten; - HB_TRACE(HB_TR_DEBUG, ("hb_fsWriteLarge(%p, %p, %lu)", hFileHandle, pBuff, ulCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsWriteLarge(%p, %p, %lu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount)); #if defined(HB_FS_FILE_IO) @@ -1646,7 +1646,7 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount, HB_FOFFS { ULONG ulRead; - HB_TRACE(HB_TR_DEBUG, ("hb_fsReadAt(%p, %p, %lu, " PFHL ")", hFileHandle, pBuff, ulCount, llOffset)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsReadAt(%p, %p, %lu, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount, llOffset)); #if defined(HB_FS_FILE_IO) @@ -1705,7 +1705,7 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount, H { ULONG ulWritten; - HB_TRACE(HB_TR_DEBUG, ("hb_fsWriteAt(%p, %p, %lu, " PFHL ")", hFileHandle, pBuff, ulCount, llOffset)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsWriteAt(%p, %p, %lu, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount, llOffset)); #if defined(HB_FS_FILE_IO) @@ -1764,7 +1764,7 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) { BOOL fResult; - HB_TRACE(HB_TR_DEBUG, ("hb_fsReadAt(%p," PFHL ")", hFileHandle, llOffset)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsReadAt(%p, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, llOffset)); #if defined(HB_FS_FILE_IO) @@ -1807,7 +1807,7 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) void hb_fsCommit( HB_FHANDLE hFileHandle ) { - HB_TRACE(HB_TR_DEBUG, ("hb_fsCommit(%p)", hFileHandle)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsCommit(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); #if defined(HB_OS_WIN_32) { @@ -1891,7 +1891,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, { BOOL bResult; - HB_TRACE(HB_TR_DEBUG, ("hb_fsLock(%p, %lu, %lu, %hu)", hFileHandle, ulStart, ulLength, uiMode)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsLock(%p, %lu, %lu, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, ulStart, ulLength, uiMode)); #if defined(HB_IO_WIN) hb_vmUnlock(); @@ -2091,11 +2091,11 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, } BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, - HB_FOFFSET ulLength, USHORT uiMode ) + HB_FOFFSET ulLength, USHORT uiMode ) { BOOL bResult; - HB_TRACE(HB_TR_DEBUG, ("hb_fsLockLarge(%p, %" PFHL "u, %" PFHL "u, %hu)", hFileHandle, ulStart, ulLength, uiMode)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsLockLarge(%p, %" PFHL "u, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, ulStart, ulLength, uiMode)); #if defined(HB_IO_WIN) { @@ -2208,7 +2208,7 @@ ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) { ULONG ulPos; - HB_TRACE(HB_TR_DEBUG, ("hb_fsSeek(%p, %ld, %hu)", hFileHandle, lOffset, uiFlags)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsSeek(%p, %ld, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, lOffset, uiFlags)); #if defined(HB_FS_FILE_IO) { @@ -2294,7 +2294,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT u { HB_FOFFSET llPos; - HB_TRACE(HB_TR_DEBUG, ("hb_fsSeekLarge(%p, %" PFHL "u, %hu)", hFileHandle, llOffset, uiFlags)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsSeekLarge(%p, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, llOffset, uiFlags)); #if defined(HB_IO_WIN) { @@ -2358,7 +2358,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT u ULONG hb_fsTell( HB_FHANDLE hFileHandle ) { - HB_TRACE(HB_TR_DEBUG, ("hb_fsTell(%p)", hFileHandle)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsTell(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); return hb_fsSeek( hFileHandle, 0, FS_RELATIVE ); } @@ -2788,7 +2788,7 @@ BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle ) { BOOL bResult; - HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDevice(%p)", hFileHandle)); + HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDevice(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); #if defined(HB_OS_WIN_32) diff --git a/harbour/source/rtl/gtcgi/gtcgi.c b/harbour/source/rtl/gtcgi/gtcgi.c index 56e6b26afd..6df6300438 100644 --- a/harbour/source/rtl/gtcgi/gtcgi.c +++ b/harbour/source/rtl/gtcgi/gtcgi.c @@ -112,7 +112,7 @@ static void hb_gt_cgi_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil { PHB_GTCGI pGTCGI; - HB_TRACE( HB_TR_DEBUG, ( "hb_gt_cgi_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr ) ); + HB_TRACE( HB_TR_DEBUG, ( "hb_gt_cgi_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) ); pGTCGI = ( PHB_GTCGI ) hb_xgrab( sizeof( HB_GTCGI ) ); memset( pGTCGI, 0, sizeof( HB_GTCGI ) ); diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c index b820ad65ed..9d9dbbb349 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.c +++ b/harbour/source/rtl/gtcrs/gtcrs.c @@ -2449,7 +2449,7 @@ static void hb_gt_crs_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil { InOutBase *ioBase; - HB_TRACE( HB_TR_DEBUG, ( "hb_gt_crs_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr ) ); + HB_TRACE( HB_TR_DEBUG, ( "hb_gt_crs_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) ); if( !s_ioBase ) { diff --git a/harbour/source/rtl/gtpca/gtpca.c b/harbour/source/rtl/gtpca/gtpca.c index ee62f70dba..9363c49e66 100644 --- a/harbour/source/rtl/gtpca/gtpca.c +++ b/harbour/source/rtl/gtpca/gtpca.c @@ -440,7 +440,7 @@ static void hb_gt_pca_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil { int iRows = 25, iCols = 80; - HB_TRACE(HB_TR_DEBUG, ("hb_gt_pca_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_pca_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr)); s_hFilenoStdin = hFilenoStdin; s_hFilenoStdout = hFilenoStdout; diff --git a/harbour/source/rtl/gtsln/gtsln.c b/harbour/source/rtl/gtsln/gtsln.c index f85de768d7..b245d6a823 100644 --- a/harbour/source/rtl/gtsln/gtsln.c +++ b/harbour/source/rtl/gtsln/gtsln.c @@ -571,7 +571,7 @@ static void hb_gt_sln_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil { BOOL gt_Inited = FALSE; - HB_TRACE(HB_TR_DEBUG, ("hb_gt_sln_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_sln_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr)); /* stdin && stdout && stderr */ s_hStdIn = hFilenoStdin; diff --git a/harbour/source/rtl/gtstd/gtstd.c b/harbour/source/rtl/gtstd/gtstd.c index 4a75f1dcc3..405c69bd79 100644 --- a/harbour/source/rtl/gtstd/gtstd.c +++ b/harbour/source/rtl/gtstd/gtstd.c @@ -204,7 +204,7 @@ static void hb_gt_std_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil { PHB_GTSTD pGTSTD; - HB_TRACE(HB_TR_DEBUG, ("hb_gt_std_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_std_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr)); pGTSTD = ( PHB_GTSTD ) hb_xgrab( sizeof( HB_GTSTD ) ); memset( pGTSTD, 0, sizeof( HB_GTSTD ) ); diff --git a/harbour/source/rtl/gttrm/gttrm.c b/harbour/source/rtl/gttrm/gttrm.c index 4fc480875f..5a8509b2e9 100644 --- a/harbour/source/rtl/gttrm/gttrm.c +++ b/harbour/source/rtl/gttrm/gttrm.c @@ -2849,7 +2849,7 @@ static void hb_gt_trm_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil int iRows = 24, iCols = 80; PHB_GTTRM pTerm; - HB_TRACE(HB_TR_DEBUG, ("hb_gt_trm_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_trm_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr)); pTerm = ( PHB_GTTRM ) hb_xgrab( sizeof( HB_GTTRM ) ); memset( pTerm, 0, sizeof( HB_GTTRM ) ); diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c index a15fed8d90..ef44c4c25c 100644 --- a/harbour/source/rtl/gtwin/gtwin.c +++ b/harbour/source/rtl/gtwin/gtwin.c @@ -642,7 +642,7 @@ static void hb_gt_win_xInitScreenParam( PHB_GT pGT ) static void hb_gt_win_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr ) { - HB_TRACE(HB_TR_DEBUG, ("hb_gt_win_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_win_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr)); s_osv.dwOSVersionInfoSize = sizeof( OSVERSIONINFO ); GetVersionEx( &s_osv ); diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c index 1dca44d7ef..a954d316b1 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.c +++ b/harbour/source/rtl/gtwvt/gtwvt.c @@ -1788,7 +1788,7 @@ static void hb_gt_wvt_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil int iCmdShow; PHB_GTWVT pWVT; - HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr ) ); + HB_TRACE( HB_TR_DEBUG, ( "hb_gt_wvt_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr ) ); if( ! hb_winmainArgGet( &hInstance, NULL, &iCmdShow ) ) hb_errInternal( 10001, "It's not a GUI program", NULL, NULL ); diff --git a/harbour/source/rtl/gtxwc/gtxwc.c b/harbour/source/rtl/gtxwc/gtxwc.c index 293e6209e3..7fc0b3be5b 100644 --- a/harbour/source/rtl/gtxwc/gtxwc.c +++ b/harbour/source/rtl/gtxwc/gtxwc.c @@ -3431,7 +3431,7 @@ static void hb_gt_xwc_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil { PXWND_DEF wnd; - HB_TRACE(HB_TR_DEBUG, ("hb_gt_xwc_Init(%p,%p,%p,%p)", pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr)); + HB_TRACE(HB_TR_DEBUG, ("hb_gt_xwc_Init(%p,%p,%p,%p)", pGT, ( void * ) ( HB_PTRDIFF ) hFilenoStdin, ( void * ) ( HB_PTRDIFF ) hFilenoStdout, ( void * ) ( HB_PTRDIFF ) hFilenoStderr)); HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr ); diff --git a/harbour/source/rtl/hbgtcore.c b/harbour/source/rtl/hbgtcore.c index 3e33f72fe2..c0250df814 100644 --- a/harbour/source/rtl/hbgtcore.c +++ b/harbour/source/rtl/hbgtcore.c @@ -2299,7 +2299,7 @@ static void hb_gt_def_InkeyIns( PHB_GT pGT, int iKey ) /* helper internal function */ static BOOL hb_gt_def_InkeyNextCheck( PHB_GT pGT, int iEventMask, int * iKey ) { - HB_TRACE( HB_TR_DEBUG, ("hb_gt_def_InkeyNextCheck(%p,%d)", pGT, iKey) ); + HB_TRACE( HB_TR_DEBUG, ("hb_gt_def_InkeyNextCheck(%p,%p)", pGT, iKey) ); if( pGT->StrBuffer ) { diff --git a/harbour/source/vm/arrays.c b/harbour/source/vm/arrays.c index bea7a3aa2b..ff5616d7ea 100644 --- a/harbour/source/vm/arrays.c +++ b/harbour/source/vm/arrays.c @@ -763,7 +763,7 @@ BOOL hb_arraySetCL( PHB_ITEM pArray, ULONG ulIndex, const char * szText, ULONG u BOOL hb_arraySetCPtr( PHB_ITEM pArray, ULONG ulIndex, char * szText, ULONG ulLen ) { - HB_TRACE(HB_TR_DEBUG, ("hb_arraySetCPtr(%p, %lu)", pArray, ulIndex, szText, ulLen)); + HB_TRACE(HB_TR_DEBUG, ("hb_arraySetCPtr(%p, %lu, %p, %lu)", pArray, ulIndex, szText, ulLen)); if( HB_IS_ARRAY( pArray ) && ulIndex > 0 && ulIndex <= pArray->item.asArray.value->ulLen ) { diff --git a/harbour/source/vm/eval.c b/harbour/source/vm/eval.c index 69bacf4d9c..34d7bb6fd0 100644 --- a/harbour/source/vm/eval.c +++ b/harbour/source/vm/eval.c @@ -204,7 +204,7 @@ PHB_ITEM hb_itemDo( PHB_ITEM pItem, ULONG ulPCount, ... ) { PHB_ITEM pResult = NULL; - HB_TRACE(HB_TR_DEBUG, ("hb_itemDo(%p, %hu, ...)", pItem, ulPCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_itemDo(%p, %lu, ...)", pItem, ulPCount)); if( pItem ) { @@ -274,7 +274,7 @@ PHB_ITEM hb_itemDoC( const char * szFunc, ULONG ulPCount, ... ) { PHB_ITEM pResult = NULL; - HB_TRACE(HB_TR_DEBUG, ("hb_itemDoC(%s, %hu, ...)", szFunc, ulPCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_itemDoC(%s, %lu, ...)", szFunc, ulPCount)); if( szFunc ) { diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c index f8b038c8e9..e9b7262f69 100644 --- a/harbour/source/vm/extend.c +++ b/harbour/source/vm/extend.c @@ -845,7 +845,7 @@ void hb_retnll( LONGLONG llNumber ) #undef hb_retnint void hb_retnint( HB_LONG lNumber ) { - HB_TRACE(HB_TR_DEBUG, ("hb_retnl(%ld)", lNumber)); + HB_TRACE(HB_TR_DEBUG, ("hb_retnl(%" PFHL "d )", lNumber)); hb_itemPutNInt( hb_stackReturnItem(), lNumber ); } diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 94b8e2f0a1..c42c1bd99f 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -5552,7 +5552,7 @@ HB_ITEM_PTR hb_vmEvalBlockV( HB_ITEM_PTR pBlock, ULONG ulArgCount, ... ) va_list va; ULONG i; - HB_TRACE(HB_TR_DEBUG, ("hb_vmEvalBlockV(%p, %hu, ...)", pBlock, ulArgCount)); + HB_TRACE(HB_TR_DEBUG, ("hb_vmEvalBlockV(%p, %lu, ...)", pBlock, ulArgCount)); hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pBlock ); @@ -5986,7 +5986,7 @@ static void hb_vmInitThreadStatics( USHORT uiCount, const BYTE * pCode ) { HB_STACK_TLS_PRELOAD - HB_TRACE(HB_TR_DEBUG, ("hb_vmInitThreadStatics(%p,%hu,%p)", uiCount, pCode)); + HB_TRACE(HB_TR_DEBUG, ("hb_vmInitThreadStatics(%hu,%p)", uiCount, pCode)); while( uiCount-- ) { @@ -5999,7 +5999,7 @@ static void hb_vmInitThreadStatics( USHORT uiCount, const BYTE * pCode ) #else static void hb_vmInitThreadStatics( USHORT uiCount, const BYTE * pCode ) { - HB_TRACE(HB_TR_DEBUG, ("hb_vmInitThreadStatics(%p,%hu,%p)", uiCount, pCode)); + HB_TRACE(HB_TR_DEBUG, ("hb_vmInitThreadStatics(%hu,%p)", uiCount, pCode)); /* single thread VM - do nothing, use normal static variables */ @@ -6253,7 +6253,7 @@ void hb_vmPushPointer( void * pPointer ) HB_STACK_TLS_PRELOAD PHB_ITEM pItem = hb_stackAllocItem(); - HB_TRACE(HB_TR_DEBUG, ("hb_vmPushPointer(%ld)", pPointer)); + HB_TRACE(HB_TR_DEBUG, ("hb_vmPushPointer(%p)", pPointer)); pItem->type = HB_IT_POINTER; pItem->item.asPointer.value = pPointer; @@ -6369,7 +6369,7 @@ static void hb_vmPushBlockShort( const BYTE * pCode, PHB_SYMB pSymbols, ULONG ul HB_STACK_TLS_PRELOAD PHB_ITEM pItem = hb_stackAllocItem(); - HB_TRACE(HB_TR_DEBUG, ("hb_vmPushBlockShort(%p,%p,%hu)", pCode, pSymbols, ulLen)); + HB_TRACE(HB_TR_DEBUG, ("hb_vmPushBlockShort(%p,%p,%lu)", pCode, pSymbols, ulLen)); pItem->item.asBlock.value = hb_codeblockNew( pCode, /* pcode buffer */ @@ -8711,7 +8711,7 @@ void hb_xvmLocalSetInt( int iLocal, LONG lValue ) HB_STACK_TLS_PRELOAD PHB_ITEM pLocal; - HB_TRACE(HB_TR_DEBUG, ("hb_xvmLocalSetInt(%d, %d)", iLocal, lValue)); + HB_TRACE(HB_TR_DEBUG, ("hb_xvmLocalSetInt(%d, %ld)", iLocal, lValue)); if( iLocal >= 0 ) { diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c index 57f9031a41..9766dde45b 100644 --- a/harbour/source/vm/itemapi.c +++ b/harbour/source/vm/itemapi.c @@ -514,7 +514,7 @@ BOOL hb_itemFreeC( char * szText ) char * hb_itemGetDS( PHB_ITEM pItem, char * szDate ) { - HB_TRACE(HB_TR_DEBUG, ("hb_itemGetDS(%p, %s)", szDate)); + HB_TRACE(HB_TR_DEBUG, ("hb_itemGetDS(%p, %s)", pItem, szDate)); if( pItem && HB_IS_DATE( pItem ) ) return hb_dateDecStr( szDate, pItem->item.asDate.value ); diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c index 0d1ca6954b..dd36837c49 100644 --- a/harbour/source/vm/memvars.c +++ b/harbour/source/vm/memvars.c @@ -553,7 +553,7 @@ char * hb_memvarGetStrValuePtr( char * szVarName, ULONG *pulLen ) HB_DYNS_PTR pDynVar; char * szValue = NULL; - HB_TRACE(HB_TR_DEBUG, ("hb_memvarGetStrValuePtr(%s, %li)", szVarName, pulLen)); + HB_TRACE(HB_TR_DEBUG, ("hb_memvarGetStrValuePtr(%s, %p)", szVarName, pulLen)); pDynVar = hb_memvarFindSymbol( szVarName, *pulLen ); diff --git a/harbour/source/vm/set.c b/harbour/source/vm/set.c index 8c29f09dcb..9e2352046c 100644 --- a/harbour/source/vm/set.c +++ b/harbour/source/vm/set.c @@ -154,7 +154,7 @@ static char * set_string( PHB_ITEM pItem, char * szOldString ) static void close_binary( HB_FHANDLE handle ) { - HB_TRACE(HB_TR_DEBUG, ("close_binary(%p)", handle)); + HB_TRACE(HB_TR_DEBUG, ("close_binary(%p)", ( void * ) ( HB_PTRDIFF ) handle)); if( handle != FS_ERROR ) { @@ -166,7 +166,7 @@ static void close_binary( HB_FHANDLE handle ) static void close_text( PHB_SET_STRUCT pSet, HB_FHANDLE handle ) { - HB_TRACE(HB_TR_DEBUG, ("close_text(%p,%p)", pSet, handle)); + HB_TRACE(HB_TR_DEBUG, ("close_text(%p,%p)", pSet, ( void * ) ( HB_PTRDIFF ) handle)); if( handle != FS_ERROR ) { diff --git a/harbour/utils/hbdoc/hbdfrdln.c b/harbour/utils/hbdoc/hbdfrdln.c index 3b053ad14a..3a15598d93 100644 --- a/harbour/utils/hbdoc/hbdfrdln.c +++ b/harbour/utils/hbdoc/hbdfrdln.c @@ -67,7 +67,7 @@ BYTE * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, char ** Term, in LONG lRead = 0, lOffset, lSize; BYTE * pBuff; - HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %hu, %i, %i)", hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); + HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %hu, %i, %i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); *bFound = FALSE; *bEOF = FALSE; diff --git a/harbour/utils/hbmake/hbmfrdln.c b/harbour/utils/hbmake/hbmfrdln.c index 3b053ad14a..3a15598d93 100644 --- a/harbour/utils/hbmake/hbmfrdln.c +++ b/harbour/utils/hbmake/hbmfrdln.c @@ -67,7 +67,7 @@ BYTE * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, char ** Term, in LONG lRead = 0, lOffset, lSize; BYTE * pBuff; - HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %hu, %i, %i)", hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); + HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %hu, %i, %i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); *bFound = FALSE; *bEOF = FALSE;