diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6bc3326f44..4b669106d4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,51 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2006-08-17 12:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/rdd_ads/ads1.c + * harbour/include/hbapi.h + * harbour/include/hbapigt.h + * harbour/include/hbapiitm.h + * harbour/include/hbdefs.h + * harbour/include/hbrdddbf.h + * harbour/include/hbstack.h + * harbour/include/hbsxfunc.h + * harbour/source/common/expropt1.c + * harbour/source/common/hbstr.c + * harbour/source/compiler/harbour.c + * harbour/source/compiler/hbident.c + * harbour/source/pp/ppcore.c + * harbour/source/rdd/hbdbsort.c + * harbour/source/rdd/dbffpt/dbffpt1.c + * harbour/source/rdd/hbsix/sxcompr.c + * harbour/source/rtl/hardcr.c + * harbour/source/rtl/inkey.c + * harbour/source/rtl/isprint.c + * harbour/source/rtl/math.c + * harbour/source/rtl/mtran.c + * harbour/source/rtl/natmsg.c + * harbour/source/rtl/gtcrs/chrmap.c + * harbour/source/rtl/gtcrs/gtcrs.c + * harbour/source/rtl/gtsln/gtsln.c + * harbour/source/rtl/gtsln/gtsln.h + * harbour/source/rtl/gtsln/kbsln.c + * harbour/source/rtl/gtsln/keytrans.c + * harbour/source/rtl/gtsln/mousesln.c + * harbour/source/vm/estack.c + * harbour/source/vm/extend.c + * harbour/source/vm/runner.c + * harbour/utils/hbver/hbverfix.c + * general code cleanup, public functions declared in header files, + local changed to static, added mising void for functions without + parameters, etc. + We still have some public functions which are not used by core code + and not declared in header files, like: + hb_memvarValueBaseAddress(), hb_memvarGetVarHandle(), + hb_memvarGetValueByHandle(), hb_clsCreate(), hb_clsAdd(), + hb_clsAssociate(), hb_hashTableDel(), hb_hashTableSize(), + I haven't touched them yet though we will have to keep in mind that + we should make sth with them. + 2006-08-16 18:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/bsd/gcc.cf * harbour/config/darwin/gcc.cf diff --git a/harbour/contrib/rdd_ads/ads1.c b/harbour/contrib/rdd_ads/ads1.c index 99ff6d9785..329e6d06e2 100644 --- a/harbour/contrib/rdd_ads/ads1.c +++ b/harbour/contrib/rdd_ads/ads1.c @@ -84,7 +84,7 @@ static RDDFUNCS adsSuper; * -- HELPER FUNCTIONS -- */ -void adsSetListener_callback( HB_set_enum setting, HB_set_listener_enum when ) +static void adsSetListener_callback( HB_set_enum setting, HB_set_listener_enum when ) { HB_TRACE(HB_TR_DEBUG, ("adsSetListener_callback (%d %d)", setting, when)); if( when == HB_SET_LISTENER_AFTER ) /* we don't do anything with BEFORE calls */ @@ -652,7 +652,7 @@ ERRCODE adsCloseCursor( ADSAREAP pArea ) * -- ADS METHODS -- */ -ERRCODE adsBof( ADSAREAP pArea, BOOL * pBof ) +static ERRCODE adsBof( ADSAREAP pArea, BOOL * pBof ) { HB_TRACE(HB_TR_DEBUG, ("sixBof(%p, %p)", pArea, pBof)); @@ -665,7 +665,7 @@ ERRCODE adsBof( ADSAREAP pArea, BOOL * pBof ) return SUCCESS; } -ERRCODE adsEof( ADSAREAP pArea, BOOL * pEof ) +static ERRCODE adsEof( ADSAREAP pArea, BOOL * pEof ) { HB_TRACE(HB_TR_DEBUG, ("adsEof(%p, %p)", pArea, pEof)); @@ -678,7 +678,7 @@ ERRCODE adsEof( ADSAREAP pArea, BOOL * pEof ) return SUCCESS; } -ERRCODE adsFound( ADSAREAP pArea, BOOL * pFound ) +static ERRCODE adsFound( ADSAREAP pArea, BOOL * pFound ) { HB_TRACE(HB_TR_DEBUG, ("adsFound(%p, %p)", pArea, pFound)); @@ -1116,7 +1116,7 @@ static ERRCODE adsSkip( ADSAREAP pArea, LONG lToSkip ) } } -ERRCODE adsSkipFilter( ADSAREAP pArea, LONG lUpDown ) +static ERRCODE adsSkipFilter( ADSAREAP pArea, LONG lUpDown ) { BOOL fBottom; ERRCODE uiError; @@ -1502,7 +1502,7 @@ static ERRCODE adsFieldCount( ADSAREAP pArea, USHORT * uiFields ) #define adsFieldDisplay NULL -ERRCODE adsFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ) +static ERRCODE adsFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ITEM pItem ) { LPFIELD pField; diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 0b826d6c50..dcdc3a74c7 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -405,6 +405,34 @@ extern HB_EXPORT BOOL hb_extIsObject( int iParam ); extern HB_EXPORT LONGLONG hb_parnll( int iParam, ... ); /* retrieve a numeric parameter as a long long */ #endif +extern HB_EXPORT int hb_pcount( void ); /* returns the number of suplied parameters */ +extern HB_EXPORT void hb_ret( void ); /* post a NIL return value */ +extern HB_EXPORT void hb_retc( const char * szText ); /* returns a string */ +extern HB_EXPORT void hb_retc_buffer( char * szText ); /* sames as above, but accepts an allocated buffer */ +extern HB_EXPORT void hb_retc_const( const char * szText ); /* returns a string as a pcode based string */ +extern HB_EXPORT void hb_retclen( const char * szText, ULONG ulLen ); /* returns a string with a specific length */ +extern HB_EXPORT void hb_retclen_buffer( char * szText, ULONG ulLen ); /* sames as above, but accepts an allocated buffer */ +extern HB_EXPORT void hb_retds( const char * szDate ); /* returns a date, must use yyyymmdd format */ +extern HB_EXPORT void hb_retd( int iYear, int iMonth, int iDay ); /* returns a date */ +extern HB_EXPORT void hb_retdl( long lJulian ); /* returns a long value as a julian date */ +extern HB_EXPORT void hb_retl( int iTrueFalse ); /* returns a logical integer */ +extern HB_EXPORT void hb_retnd( double dNumber ); /* returns a double */ +extern HB_EXPORT void hb_retni( int iNumber ); /* returns a integer number */ +extern HB_EXPORT void hb_retnl( long lNumber );/* returns a long number */ +extern HB_EXPORT void hb_retnint( HB_LONG lNumber );/* returns a long number */ +extern HB_EXPORT void hb_retnlen( double dNumber, int iWidth, int iDec ); /* returns a double, with specific width and decimals */ +extern HB_EXPORT void hb_retndlen( double dNumber, int iWidth, int iDec ); /* returns a double, with specific width and decimals */ +extern HB_EXPORT void hb_retnilen( int iNumber, int iWidth ); /* returns a integer number, with specific width */ +extern HB_EXPORT void hb_retnllen( long lNumber, int iWidth ); /* returns a long number, with specific width */ +extern HB_EXPORT void hb_retnintlen( HB_LONG lNumber, int iWidth ); /* returns a long long number, with specific width */ +extern HB_EXPORT void hb_reta( ULONG ulLen ); /* returns an array with a specific length */ +extern HB_EXPORT void hb_retptr( void * ptr ); /* returns a pointer */ +extern HB_EXPORT void hb_retptrGC( void * ptr ); /* returns a pointer to an allocated memory, collected by GC */ +#ifndef HB_LONG_LONG_OFF +extern HB_EXPORT void hb_retnll( LONGLONG lNumber );/* returns a long long number */ +extern HB_EXPORT void hb_retnlllen( LONGLONG lNumber, int iWidth ); /* returns a long long number, with specific width */ +#endif + /* xHarbour compatible function */ #define hb_retcAdopt( szText ) hb_retc_buffer( (szText) ) #define hb_retclenAdopt( szText, ulLen ) hb_retclen_buffer( (szText), (ulLen) ) @@ -439,37 +467,8 @@ extern HB_EXPORT LONGLONG hb_parnll( int iParam, ... ); /* retrieve a numeric #define hb_retptr( pointer ) hb_itemPutPtr( hb_stackReturnItem(), pointer ) #define hb_retptrGC( pointer ) hb_itemPutPtrGC( hb_stackReturnItem(), pointer ) -#else +#endif /* HB_API_MACROS */ -extern HB_EXPORT int hb_pcount( void ); /* returns the number of suplied parameters */ -extern HB_EXPORT void hb_ret( void ); /* post a NIL return value */ -extern HB_EXPORT void hb_retc( const char * szText ); /* returns a string */ -extern HB_EXPORT void hb_retc_buffer( char * szText ); /* sames as above, but accepts an allocated buffer */ -extern HB_EXPORT void hb_retc_const( const char * szText ); /* returns a string as a pcode based string */ -extern HB_EXPORT void hb_retclen( const char * szText, ULONG ulLen ); /* returns a string with a specific length */ -extern HB_EXPORT void hb_retclen_buffer( char * szText, ULONG ulLen ); /* sames as above, but accepts an allocated buffer */ -extern HB_EXPORT void hb_retds( const char * szDate ); /* returns a date, must use yyyymmdd format */ -extern HB_EXPORT void hb_retd( int iYear, int iMonth, int iDay ); /* returns a date */ -extern HB_EXPORT void hb_retdl( long lJulian ); /* returns a long value as a julian date */ -extern HB_EXPORT void hb_retl( int iTrueFalse ); /* returns a logical integer */ -extern HB_EXPORT void hb_retnd( double dNumber ); /* returns a double */ -extern HB_EXPORT void hb_retni( int iNumber ); /* returns a integer number */ -extern HB_EXPORT void hb_retnl( long lNumber );/* returns a long number */ -extern HB_EXPORT void hb_retnint( HB_LONG lNumber );/* returns a long number */ -extern HB_EXPORT void hb_retnlen( double dNumber, int iWidth, int iDec ); /* returns a double, with specific width and decimals */ -extern HB_EXPORT void hb_retndlen( double dNumber, int iWidth, int iDec ); /* returns a double, with specific width and decimals */ -extern HB_EXPORT void hb_retnilen( int iNumber, int iWidth ); /* returns a integer number, with specific width */ -extern HB_EXPORT void hb_retnllen( long lNumber, int iWidth ); /* returns a long number, with specific width */ -extern HB_EXPORT void hb_retnintlen( HB_LONG lNumber, int iWidth ); /* returns a long long number, with specific width */ -extern HB_EXPORT void hb_reta( ULONG ulLen ); /* returns an array with a specific length */ -extern HB_EXPORT void hb_retptr( void * ptr ); /* returns a pointer */ -extern HB_EXPORT void hb_retptrGC( void * ptr ); /* returns a pointer to an allocated memory, collected by GC */ -#ifndef HB_LONG_LONG_OFF -extern HB_EXPORT void hb_retnll( LONGLONG lNumber );/* returns a long long number */ -extern HB_EXPORT void hb_retnlllen( LONGLONG lNumber, int iWidth ); /* returns a long long number, with specific width */ -#endif - -#endif extern HB_EXPORT int hb_storc( char * szText, int iParam, ... ); /* stores a szString on a variable by reference */ extern HB_EXPORT int hb_storclen( char * szText, ULONG ulLength, int iParam, ... ); /* stores a fixed length string on a variable by reference */ @@ -643,7 +642,6 @@ extern HB_EXPORT BOOL hb_strMatchWildExact( const char *szString, const char extern HB_EXPORT BOOL hb_strEmpty( const char * szText, ULONG ulLen ); /* returns whether a string contains only white space */ extern HB_EXPORT void hb_strDescend( char * szStringTo, const char * szStringFrom, ULONG ulLen ); /* copy a string to a buffer, inverting each character */ extern HB_EXPORT ULONG hb_strAt( const char * szSub, ULONG ulSubLen, const char * szText, ULONG ulLen ); /* returns an index to a sub-string within another string */ -extern HB_EXPORT char * hb_stripOutComments( char* buffer ); /* extract uncommented part of read buffer */ extern HB_EXPORT char * hb_strUpper( char * szText, ULONG ulLen ); /* convert an existing string buffer to upper case */ extern HB_EXPORT char * hb_strUpperCopy( char * szText, ULONG ulLen ); extern HB_EXPORT char * hb_strLower( char * szText, ULONG ulLen ); /* convert an existing string buffer to lower case */ diff --git a/harbour/include/hbapigt.h b/harbour/include/hbapigt.h index 76b6a69a93..050962885c 100644 --- a/harbour/include/hbapigt.h +++ b/harbour/include/hbapigt.h @@ -259,6 +259,8 @@ extern HB_EXPORT void hb_inkeyPoll( void ); /* Poll the console key extern HB_EXPORT void hb_inkeyReset( void ); /* Reset the Harbour keyboard buffer */ extern HB_EXPORT int hb_inkeyTranslate( int key, int iEvenMask ); /* Translation extended codes to normal codes, if needed */ extern HB_EXPORT void hb_inkeySetCancelKeys( int CancelKey, int CancelKeyEx ); /* Set keycodes for Cancel key (usually K_ALT_C) */ +extern HB_EXPORT int hb_setInkeyLast( int iKey ); +extern HB_EXPORT void hb_inkeyExit( void ); /* SetKey related declarations */ diff --git a/harbour/include/hbapiitm.h b/harbour/include/hbapiitm.h index 56e4a597e8..e32f7cddda 100644 --- a/harbour/include/hbapiitm.h +++ b/harbour/include/hbapiitm.h @@ -69,10 +69,14 @@ extern HB_EXPORT PHB_ITEM hb_evalLaunch ( PEVALINFO pEvalInfo ); extern HB_EXPORT BOOL hb_evalNew ( PEVALINFO pEvalInfo, PHB_ITEM pItem ); extern HB_EXPORT BOOL hb_evalPutParam ( PEVALINFO pEvalInfo, PHB_ITEM pItem ); extern HB_EXPORT BOOL hb_evalRelease ( PEVALINFO pEvalInfo ); - + +extern HB_EXPORT void hb_evalBlock( PHB_ITEM pCodeBlock, ... ); +extern HB_EXPORT void hb_evalBlock0( PHB_ITEM pCodeBlock ); +extern HB_EXPORT void hb_evalBlock1( PHB_ITEM pCodeBlock, PHB_ITEM pParam ); + extern HB_EXPORT PHB_ITEM hb_itemDo ( PHB_ITEM pItem, ULONG ulPCount, ... ); extern HB_EXPORT PHB_ITEM hb_itemDoC ( char * szFunc, ULONG ulPCount, ... ); - + extern HB_EXPORT PHB_ITEM hb_itemArrayGet ( PHB_ITEM pArray, ULONG ulIndex ); extern HB_EXPORT PHB_ITEM hb_itemArrayNew ( ULONG ulLen ); extern HB_EXPORT PHB_ITEM hb_itemArrayPut ( PHB_ITEM pArray, ULONG ulIndex, PHB_ITEM pItem ); diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index eabc9d7805..94b3b9c35e 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -396,9 +396,13 @@ * numeric constant. This suffix is necessary for some compilers - * without it they cut the number to LONG */ -#if __BORLANDC__ -0 >= 1328 -# define HB_LL( num ) num##i64 -#elif defined( _MSC_VER ) || defined( __BORLANDC__ ) +#if defined( __BORLANDC__ ) +# if __BORLANDC__ >= 1328 +# define HB_LL( num ) num##i64 +# else +# define HB_LL( num ) num +# endif +#elif defined( _MSC_VER ) # define HB_LL( num ) num #else # define HB_LL( num ) num##LL diff --git a/harbour/include/hbrdddbf.h b/harbour/include/hbrdddbf.h index 47f2f6dbb1..5c78ef2020 100644 --- a/harbour/include/hbrdddbf.h +++ b/harbour/include/hbrdddbf.h @@ -339,6 +339,10 @@ extern HB_EXPORT ERRCODE hb_dbfGetEGcode( ERRCODE errCode ); extern HB_EXPORT BOOL hb_dbfLockIdxFile( FHANDLE hFile, BYTE bScheme, USHORT usMode, HB_FOFFSET *pPoolPos ); extern HB_EXPORT BOOL hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET *ulPool ); +#ifndef HB_CDP_SUPPORT_OFF +extern void hb_dbfTranslateRec( DBFAREAP pArea, BYTE * pBuffer, PHB_CODEPAGE cdp_src, PHB_CODEPAGE cdp_dest ); +#endif + HB_EXTERN_END #endif /* HB_RDDDBF_H_ */ diff --git a/harbour/include/hbstack.h b/harbour/include/hbstack.h index 9ca3479c18..d74b50d873 100644 --- a/harbour/include/hbstack.h +++ b/harbour/include/hbstack.h @@ -89,6 +89,47 @@ typedef struct #endif +extern HB_ITEM_PTR hb_stackItemFromTop( int nFromTop ); +extern HB_ITEM_PTR hb_stackItemFromBase( int nFromBase ); +extern LONG hb_stackTopOffset( void ); +extern LONG hb_stackBaseOffset( void ); +extern LONG hb_stackTotalItems( void ); +extern HB_ITEM_PTR hb_stackBaseItem( void ); +extern HB_ITEM_PTR hb_stackSelfItem( void ); +extern HB_ITEM_PTR hb_stackItem( LONG iItemPos ); +extern HB_ITEM_PTR hb_stackReturnItem( void ); +extern char * hb_stackDateBuffer( void ); +extern void hb_stackSetStaticsBase( int iBase ); +extern int hb_stackGetStaticsBase( void ); +extern PHB_ITEM ** hb_stackItemBasePtr( void ); +extern PHB_ITEM hb_stackWithObjectItem( void ); +extern LONG hb_stackWithObjectOffset( void ); +extern void hb_stackWithObjectSetOffset( LONG ); + +extern void hb_stackDec( void ); /* pops an item from the stack without clearing it's contents */ +extern void hb_stackPop( void ); /* pops an item from the stack */ +extern void hb_stackPush( void ); /* pushes an item on to the stack */ +extern HB_ITEM_PTR hb_stackAllocItem( void ); /* allocates new item on the top of stack, returns pointer to it */ +extern void hb_stackPushReturn( void ); +extern void hb_stackPopReturn( void ); +extern void hb_stackRemove( LONG lUntilPos ); + +/* stack management functions */ +extern int hb_stackCallDepth( void ); +extern LONG hb_stackBaseProcOffset( int iLevel ); +extern void hb_stackBaseProcInfo( char * szProcName, USHORT * puiProcLine ); /* get current .PRG function name and line number */ +extern void hb_stackDispLocal( void ); /* show the types of the items on the stack for debugging purposes */ +extern void hb_stackDispCall( void ); +extern void hb_stackFree( void ); /* releases all memory used by the stack */ +extern void hb_stackInit( void ); /* initializes the stack */ +extern void hb_stackIncrease( void ); /* increase the stack size */ + +#ifdef _HB_API_INTERNAL_ +extern void hb_stackDecrease( ULONG ulItems ); +extern HB_ITEM_PTR hb_stackNewFrame( HB_STACK_STATE * pStack, USHORT uiParams ); +extern void hb_stackOldFrame( HB_STACK_STATE * pStack ); +#endif + #if defined(HB_STACK_MACROS) #define hb_stackItemFromTop( n ) ( * ( hb_stack.pPos + ( int ) (n) ) ) @@ -96,7 +137,6 @@ typedef struct #define hb_stackTopOffset( ) ( hb_stack.pPos - hb_stack.pItems ) #define hb_stackBaseOffset( ) ( hb_stack.pBase - hb_stack.pItems + 1 ) #define hb_stackTotalItems( ) ( hb_stack.wItems ) -/*#define hb_stackTopItem( ) ( * hb_stack.pPos )*/ #define hb_stackBaseItem( ) ( * hb_stack.pBase ) #define hb_stackSelfItem( ) ( * ( hb_stack.pBase + 1 ) ) #define hb_stackItem( iItemPos ) ( * ( hb_stack.pItems + ( iItemPos ) ) ) @@ -148,49 +188,8 @@ typedef struct if( ++hb_stack.pPos == hb_stack.pEnd ) \ hb_stackIncrease(); \ } while ( 0 ) -#else - -extern HB_ITEM_PTR hb_stackItemFromTop( int nFromTop ); -extern HB_ITEM_PTR hb_stackItemFromBase( int nFromBase ); -extern LONG hb_stackTopOffset( void ); -extern LONG hb_stackBaseOffset( void ); -extern LONG hb_stackTotalItems( void ); -/*extern HB_ITEM_PTR hb_stackTopItem( void );*/ -extern HB_ITEM_PTR hb_stackBaseItem( void ); -extern HB_ITEM_PTR hb_stackSelfItem( void ); -extern HB_ITEM_PTR hb_stackItem( LONG iItemPos ); -extern HB_ITEM_PTR hb_stackReturnItem( void ); -extern char * hb_stackDateBuffer( void ); -extern void hb_stackSetStaticsBase( int iBase ); -extern int hb_stackGetStaticsBase( void ); -extern PHB_ITEM ** hb_stackItemBasePtr( void ); -extern PHB_ITEM hb_stackWithObjectItem( void ); -extern LONG hb_stackWithObjectOffset( void ); -extern void hb_stackWithObjectSetOffset( LONG ); - -extern void hb_stackDec( void ); /* pops an item from the stack without clearing it's contents */ -extern void hb_stackPop( void ); /* pops an item from the stack */ -extern void hb_stackPush( void ); /* pushes an item on to the stack */ -extern HB_ITEM_PTR hb_stackAllocItem( void ); /* allocates new item on the top of stack, returns pointer to it */ - #endif -/* stack management functions */ -extern int hb_stackCallDepth( void ); -extern LONG hb_stackBaseProcOffset( int iLevel ); -extern void hb_stackBaseProcInfo( char * szProcName, USHORT * puiProcLine ); /* get current .PRG function name and line number */ -extern void hb_stackDispLocal( void ); /* show the types of the items on the stack for debugging purposes */ -extern void hb_stackDispCall( void ); -extern void hb_stackFree( void ); /* releases all memory used by the stack */ -extern void hb_stackInit( void ); /* initializes the stack */ -extern void hb_stackIncrease( void ); /* increase the stack size */ - -extern void hb_stackRemove( LONG lUntilPos ); - -#ifdef _HB_API_INTERNAL_ -extern HB_ITEM_PTR hb_stackNewFrame( HB_STACK_STATE * pStack, USHORT uiParams ); -extern void hb_stackOldFrame( HB_STACK_STATE * pStack ); -#endif HB_EXTERN_END diff --git a/harbour/include/hbsxfunc.h b/harbour/include/hbsxfunc.h index 78f439c6d4..1af3185a42 100644 --- a/harbour/include/hbsxfunc.h +++ b/harbour/include/hbsxfunc.h @@ -69,7 +69,7 @@ void hb_sxEnCrypt( BYTE * pSrc, BYTE * pDst, BYTE * pKeyVal, ULONG ulLen ); void hb_sxDeCrypt( BYTE * pSrc, BYTE * pDst, BYTE * pKeyVal, ULONG ulLen ); BOOL hb_LZSSxDecompressMem( BYTE * pSrcBuf, ULONG ulSrcLen, BYTE * pDstBuf, ULONG ulDstLen ); -BOOL hb_LZSSxDecompressMem( BYTE * pSrcBuf, ULONG ulSrcLen, BYTE * pDstBuf, ULONG ulDstLen ); +BOOL hb_LZSSxCompressMem( BYTE * pSrcBuf, ULONG ulSrcLen, BYTE * pDstBuf, ULONG ulDstLen, ULONG * pulSize ); BOOL hb_LZSSxCompressFile( FHANDLE hInput, FHANDLE hOutput, ULONG * pulSize ); BOOL hb_LZSSxDecompressFile( FHANDLE hInput, FHANDLE hOutput ); diff --git a/harbour/source/common/expropt1.c b/harbour/source/common/expropt1.c index 12bc7b5870..9a768dea7d 100644 --- a/harbour/source/common/expropt1.c +++ b/harbour/source/common/expropt1.c @@ -362,7 +362,7 @@ HB_EXPR_PTR hb_compExprNewFunRef( char * szFunName ) HB_TRACE(HB_TR_DEBUG, ("hb_compExprNewFunRef(%s)", szFunName)); - pExpr =hb_compExprNew( HB_ET_FUNREF ); + pExpr = hb_compExprNew( HB_ET_FUNREF ); pExpr->value.asSymbol = szFunName; pExpr->ValType = HB_EV_FUNREF; @@ -375,7 +375,7 @@ HB_EXPR_PTR hb_compExprNewRef( HB_EXPR_PTR pRefer ) HB_TRACE(HB_TR_DEBUG, ("hb_compExprNewRef(%p)", pRefer)); - pExpr =hb_compExprNew( HB_ET_REFERENCE ); + pExpr = hb_compExprNew( HB_ET_REFERENCE ); pExpr->value.asReference = pRefer; pExpr->ValType = HB_EV_VARREF; diff --git a/harbour/source/common/hbstr.c b/harbour/source/common/hbstr.c index 237c56ddc6..005dca3047 100644 --- a/harbour/source/common/hbstr.c +++ b/harbour/source/common/hbstr.c @@ -851,78 +851,6 @@ HB_EXPORT char * hb_strncpyTrim( char * pDest, const char * pSource, ULONG ulLen return pBuf; } -/* - Simple routine to extract uncommented part of (read) buffer -*/ -HB_EXPORT char *hb_stripOutComments( char* buffer ) -{ - if( buffer && *buffer ) - { - USHORT ui = strlen( buffer ); - char *szOut = (char*) hb_xgrab( ui + 1 ); - int i; - int uu = 0; - char *last; - - hb_xmemset( szOut, 0, ui + 1 ); - - for ( i = 0; i < ui; i ++ ) - { - if ( buffer[ i ] == '/' ) - { - if( buffer [ i + 1 ] == '*' ) - { - i ++; - while ( ++ i < ui ) - { - if ( buffer [ i ] == '*' && buffer [ i + 1 ] == '/' ) - { - i += 2; - break; - } - } - } - else if ( buffer[ i + 1 ] == '/' ) - { - while ( ++ i < ui ) - { - if ( buffer [ i ] == '\n' || buffer [ i ] == '\r' ) - { - break; - } - } - } - } - - szOut[ uu ++ ] = buffer[ i ]; - } - - /* trim left */ - while ( HB_ISSPACE( *szOut ) ) - { - strcpy( szOut, szOut + 1 ); - } - - /* trim right */ - last = szOut + strlen ( szOut ); - while ( last > szOut ) - { - if ( !HB_ISSPACE( *( last - 1 ) ) ) - { - break; - } - last--; - } - - *last = 0; - return( szOut ); - } - else - { - return ( NULL ); - } -} - char * hb_strRemEscSeq( char *str, ULONG *pLen ) { char *ptr = str; diff --git a/harbour/source/compiler/harbour.c b/harbour/source/compiler/harbour.c index efcbe78f7e..fd4e0001db 100644 --- a/harbour/source/compiler/harbour.c +++ b/harbour/source/compiler/harbour.c @@ -88,7 +88,6 @@ static PINLINE hb_compInlineNew( char * ); /* creates and initialises the _INLI static void hb_compCheckDuplVars( PVAR pVars, char * szVarName ); /*checks for duplicate variables definitions */ static int hb_compProcessRSPFile( char *, int, char * argv[] ); /* process response file */ -/* int hb_compSort_ULONG( ULONG * ulLeft, ULONG * ulRight ); */ static void hb_compOptimizeJumps( void ); static void hb_compOptimizeFrames( PFUNCTION pFunc ); @@ -3747,11 +3746,7 @@ static void hb_compOptimizeFrames( PFUNCTION pFunc ) } } -int -#ifdef __IBMCPP__ -extern _LNK_CONV -#endif -hb_compSort_ULONG( const void * pLeft, const void * pRight ) +static int hb_compSort_ULONG( const void * pLeft, const void * pRight ) { ULONG ulLeft = *( ( ULONG * ) ( pLeft ) ); ULONG ulRight = *( ( ULONG * ) ( pRight ) ); diff --git a/harbour/source/compiler/hbident.c b/harbour/source/compiler/hbident.c index 29adb52548..5832a00f55 100644 --- a/harbour/source/compiler/hbident.c +++ b/harbour/source/compiler/hbident.c @@ -57,7 +57,7 @@ char * hb_compIdentifierNew( char * szName, BOOL bCopy ) } /* returns a hash key */ -HB_HASH_FUNC( hb_comp_IdentKey ) /* ULONG func (void *Value, void *Cargo) */ +static HB_HASH_FUNC( hb_comp_IdentKey ) /* ULONG func (void *Value, void *Cargo) */ { ULONG ulSum = 0; char *szName = ( char * )Value; @@ -72,7 +72,7 @@ HB_HASH_FUNC( hb_comp_IdentKey ) /* ULONG func (void *Value, void *Cargo) */ } /* deletes an identifier */ -HB_HASH_FUNC( hb_comp_IdentDel ) +static HB_HASH_FUNC( hb_comp_IdentDel ) { hb_xfree( Value ); HB_SYMBOL_UNUSED( HashPtr ); @@ -81,7 +81,7 @@ HB_HASH_FUNC( hb_comp_IdentDel ) } /* compares two identifiers */ -HB_HASH_FUNC( hb_comp_IdentComp ) +static HB_HASH_FUNC( hb_comp_IdentComp ) { HB_SYMBOL_UNUSED( HashPtr ); return strcmp( (char *)Value, (char *)Cargo ); diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index be13b8ff2b..422b5431a3 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -238,7 +238,7 @@ char *hb_pp_szWarnings[] = { "1No directives in command definitions file" }; -void hb_pp_SetRules( HB_INCLUDE_FUNC_PTR hb_compInclude, BOOL hb_comp_bQuiet ) +void hb_pp_SetRules( HB_INCLUDE_FUNC_PTR pIncludeFunc, BOOL bQuiet ) { HB_TRACE( HB_TR_DEBUG, ( "hb_pp_SetRules()" ) ); @@ -257,7 +257,7 @@ void hb_pp_SetRules( HB_INCLUDE_FUNC_PTR hb_compInclude, BOOL hb_comp_bQuiet ) hb_fsFNameMerge( szFileName, hb_comp_pFileName ); - if( ( *hb_compInclude ) ( szFileName, hb_comp_pIncludePath ) ) + if( ( *pIncludeFunc ) ( szFileName, hb_comp_pIncludePath ) ) { hb_pp_Init( ); @@ -265,7 +265,7 @@ void hb_pp_SetRules( HB_INCLUDE_FUNC_PTR hb_compInclude, BOOL hb_comp_bQuiet ) if( s_kolAddComs || s_kolAddTras || s_kolAddDefs > 3 ) { - if( !hb_comp_bQuiet ) + if( !bQuiet ) printf( "Loaded: %i Commands, %i Translates, %i Defines from: %s\n", s_kolAddComs, s_kolAddTras, s_kolAddDefs - 3, szFileName ); } else @@ -299,7 +299,7 @@ void hb_pp_SetRules( HB_INCLUDE_FUNC_PTR hb_compInclude, BOOL hb_comp_bQuiet ) } else { - if( !hb_comp_bQuiet ) + if( !bQuiet ) printf( "Standard command definitions excluded.\n" ); hb_pp_Init( ); @@ -1105,7 +1105,7 @@ static int ConvertOptional( char *cpatt, int len, BOOL bLeft ) j++; while( cpatt[j] == ' ' || cpatt[j] == '\t' ) j++; - if( strchr( "*(!-{.\"", cpatt[j] ) || ISNAME( cpatt[j] ) ) + if( strchr( "*(!-{.\"", cpatt[j] ) || ISNAME( ( BYTE ) cpatt[j] ) ) { bOption = TRUE; continue; diff --git a/harbour/source/rdd/dbffpt/dbffpt1.c b/harbour/source/rdd/dbffpt/dbffpt1.c index 086b9f51d4..6b43a9e40e 100644 --- a/harbour/source/rdd/dbffpt/dbffpt1.c +++ b/harbour/source/rdd/dbffpt/dbffpt1.c @@ -2455,8 +2455,9 @@ static ERRCODE hb_fptReadRawBlock( FPTAREAP pArea, BYTE * bBuffer, FHANDLE hFile return errCode; } -ERRCODE hb_fptReadBlobBlock( FPTAREAP pArea, PHB_ITEM pItem, FHANDLE hFile, - ULONG ulBlock, USHORT uiMode ) +static ERRCODE hb_fptReadBlobBlock( FPTAREAP pArea, PHB_ITEM pItem, + FHANDLE hFile, ULONG ulBlock, + USHORT uiMode ) { ULONG ulSize; BYTE buffer[ 4 ]; @@ -2498,7 +2499,8 @@ ERRCODE hb_fptReadBlobBlock( FPTAREAP pArea, PHB_ITEM pItem, FHANDLE hFile, return SUCCESS; } -ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem, ULONG ulBlock, ULONG ulSize ) +static ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem, + ULONG ulBlock, ULONG ulSize ) { if( ulBlock == 0 ) return EDBF_CORRUPT; diff --git a/harbour/source/rdd/hbdbsort.c b/harbour/source/rdd/hbdbsort.c index ed3cbdca3e..20a1170f7e 100644 --- a/harbour/source/rdd/hbdbsort.c +++ b/harbour/source/rdd/hbdbsort.c @@ -52,13 +52,6 @@ #include "hbdbsort.h" -#ifndef HB_CDP_SUPPORT_OFF -# include "hbapicdp.h" - -void hb_dbfTranslateRec( DBFAREAP pArea, BYTE * pBuffer, PHB_CODEPAGE cdp_src, PHB_CODEPAGE cdp_dest ); -#endif - - BOOL hb_dbQSortInit( LPDBQUICKSORT pQuickSort, LPDBSORTINFO pSortInfo, USHORT uiRecordLen ) { /* Create temp file */ diff --git a/harbour/source/rdd/hbsix/sxcompr.c b/harbour/source/rdd/hbsix/sxcompr.c index 10a80ec7ce..4ccf010076 100644 --- a/harbour/source/rdd/hbsix/sxcompr.c +++ b/harbour/source/rdd/hbsix/sxcompr.c @@ -198,7 +198,7 @@ typedef struct _HB_LZSSX_COMPR HB_LZSSX_COMPR; typedef HB_LZSSX_COMPR * PHB_LZSSX_COMPR; -void hb_LZSSxExit( PHB_LZSSX_COMPR pCompr ) +static void hb_LZSSxExit( PHB_LZSSX_COMPR pCompr ) { if( pCompr->fInFree ) hb_xfree( pCompr->inBuffer ); diff --git a/harbour/source/rtl/gtcrs/chrmap.c b/harbour/source/rtl/gtcrs/chrmap.c index 3ae0a15764..92536fb309 100644 --- a/harbour/source/rtl/gtcrs/chrmap.c +++ b/harbour/source/rtl/gtcrs/chrmap.c @@ -279,7 +279,7 @@ static int chrmap_parse( FILE *fp, char *pszTerm, int *nTransTbl, char *pszFile return isTerm; } -int hb_gt_crs_chrmapread( char *pszFile, char *pszTerm, int *nTransTbl ) +static int hb_gt_crs_chrmapread( char *pszFile, char *pszTerm, int *nTransTbl ) { FILE *fp; char buf[256], *ptr, *pTerm; diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c index a0efb992be..775ac4dfd3 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.c +++ b/harbour/source/rtl/gtcrs/gtcrs.c @@ -169,7 +169,7 @@ static int getMouseKey(mouseEvent *); static void destroy_ioBase(InOutBase *ioBase); static void sig_handler(int signo); -static void curs_wrkaround(); +static void curs_wrkaround( void ); typedef struct ClipKeyCode { int key; @@ -2993,11 +2993,11 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ ) #if defined(HB_GT_CRS_BCEHACK) && defined(NCURSES_VERSION) && !defined(HB_NCURSES_194) #include -static void curs_wrkaround() +static void curs_wrkaround( void ) { back_color_erase = FALSE; /* cur_term->type.Booleans[28] = 0; */ } #else -static void curs_wrkaround() {;} +static void curs_wrkaround( void ) {;} #endif diff --git a/harbour/source/rtl/gtsln/gtsln.c b/harbour/source/rtl/gtsln/gtsln.c index d39ec6f12b..98475d190e 100644 --- a/harbour/source/rtl/gtsln/gtsln.c +++ b/harbour/source/rtl/gtsln/gtsln.c @@ -727,7 +727,7 @@ static void hb_gt_sln_Exit( void ) /* *********************************************************************** */ -BOOL hb_gt_sln_SetMode( int iRows, int iCols ) +static BOOL hb_gt_sln_SetMode( int iRows, int iCols ) { HB_TRACE(HB_TR_DEBUG, ("hb_gt_sln_SetMode(%d, %d)", iRows, iCols)); diff --git a/harbour/source/rtl/gtsln/gtsln.h b/harbour/source/rtl/gtsln/gtsln.h index afb7054e3f..55ed40aa9f 100644 --- a/harbour/source/rtl/gtsln/gtsln.h +++ b/harbour/source/rtl/gtsln/gtsln.h @@ -244,7 +244,7 @@ extern void hb_gt_sln_mouse_SetPos( int iRow, int iCol ); extern int hb_gt_sln_mouse_CountButton( void ); extern BOOL hb_gt_sln_mouse_ButtonState( int iButton ); -extern void hb_gt_sln_mouse_FixTrash(); +extern void hb_gt_sln_mouse_FixTrash( void ); extern int hb_gt_sln_mouse_Inkey( int iEventMask, BOOL fCheckNew ); extern void hb_gt_sln_mouse_ProcessTerminalEvent( void ); diff --git a/harbour/source/rtl/gtsln/kbsln.c b/harbour/source/rtl/gtsln/kbsln.c index 74e059067b..2099ee6601 100644 --- a/harbour/source/rtl/gtsln/kbsln.c +++ b/harbour/source/rtl/gtsln/kbsln.c @@ -128,7 +128,7 @@ int hb_DeadKey = -1; BOOL hb_sln_UnderLinuxConsole = FALSE; BOOL hb_sln_UnderXterm = FALSE; -static int hb_sln_try_get_Kbd_State(); +static int hb_sln_try_get_Kbd_State( void ); /* key translations tables - notice problems with compilation after changes */ #include "keytrans.c" @@ -458,7 +458,7 @@ int hb_gt_sln_ReadKey( int iEventMask ) /* *********************************************************************** */ -static int hb_sln_try_get_Kbd_State() +static int hb_sln_try_get_Kbd_State( void ) { #if defined(__linux__) unsigned char modifiers = 6; @@ -518,7 +518,7 @@ int hb_sln_Ctrl_Pressed() /* *********************************************************************** */ -int hb_slngt_Alt_Pressed() +int hb_sln_Alt_Pressed() { return ( hb_sln_try_get_Kbd_State() & ALT_PRESSED ) != 0; } diff --git a/harbour/source/rtl/gtsln/keytrans.c b/harbour/source/rtl/gtsln/keytrans.c index 4961137777..0246dcebfa 100644 --- a/harbour/source/rtl/gtsln/keytrans.c +++ b/harbour/source/rtl/gtsln/keytrans.c @@ -459,7 +459,7 @@ static int hb_sln_FindKeyTranslation( int SlangKey ) } /* ************************************************************************* */ - +#if 0 int hb_sln_SetKeyInKeyTranslationTable( int SlangKey, int ClipKey ) { int i, Found = 0; @@ -478,5 +478,5 @@ int hb_sln_SetKeyInKeyTranslationTable( int SlangKey, int ClipKey ) return( Found ); } - +#endif /* ************************************************************************* */ diff --git a/harbour/source/rtl/gtsln/mousesln.c b/harbour/source/rtl/gtsln/mousesln.c index ef64d0d5db..ae7dace73b 100644 --- a/harbour/source/rtl/gtsln/mousesln.c +++ b/harbour/source/rtl/gtsln/mousesln.c @@ -504,7 +504,7 @@ int hb_gt_sln_mouse_CountButton( void ) /* *********************************************************************** */ -void hb_gt_sln_mouse_FixTrash() +void hb_gt_sln_mouse_FixTrash( void ) { #ifdef HAVE_GPM_H if( hb_sln_UnderLinuxConsole ) diff --git a/harbour/source/rtl/hardcr.c b/harbour/source/rtl/hardcr.c index 05fcfa1443..ef6825e632 100644 --- a/harbour/source/rtl/hardcr.c +++ b/harbour/source/rtl/hardcr.c @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbapiitm.h" -char * hb_strHardCR( char * pszString, ULONG ulStringLen ) +static char * hb_strHardCR( char * pszString, ULONG ulStringLen ) { ULONG ulStringPos; diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c index 6b0cf271c2..eca52b4e13 100644 --- a/harbour/source/rtl/inkey.c +++ b/harbour/source/rtl/inkey.c @@ -367,7 +367,7 @@ HB_EXPORT int hb_inkeyLast( int iEventMask ) } /* Force a value to s_inkeyLast and return previous value */ -int hb_setInkeyLast( int iKey ) +HB_EXPORT int hb_setInkeyLast( int iKey ) { int iLast = s_inkeyLast; diff --git a/harbour/source/rtl/isprint.c b/harbour/source/rtl/isprint.c index 6db4f5be4e..0862d17fde 100644 --- a/harbour/source/rtl/isprint.c +++ b/harbour/source/rtl/isprint.c @@ -80,7 +80,7 @@ static BOOL DPGetDefaultPrinter(LPTSTR pPrinterName, LPDWORD pdwBufferSize); #endif -BOOL hb_printerIsReady( char * pszPrinterName ) +static BOOL hb_printerIsReady( char * pszPrinterName ) { BOOL bIsPrinter; diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c index 006f299603..28a77f6411 100644 --- a/harbour/source/rtl/math.c +++ b/harbour/source/rtl/math.c @@ -207,7 +207,7 @@ matherr (struct exception * err) #elif defined(HB_MATH_ERRNO) -int hb_mathErrSet( double dResult, double arg1, double arg2, char * szFunc, int errCode ) +static int hb_mathErrSet( double dResult, double arg1, double arg2, char * szFunc, int errCode ) { HB_MATH_HANDLERPROC mathHandler; diff --git a/harbour/source/rtl/mtran.c b/harbour/source/rtl/mtran.c index 14cc012477..15d4ead967 100644 --- a/harbour/source/rtl/mtran.c +++ b/harbour/source/rtl/mtran.c @@ -55,7 +55,7 @@ /* NOTE: pszResult must have an allocated buffer of at least ulStringLen */ -char * hb_strMemotran( char * pszResult, ULONG * ulResultLen, const char * pszString, ULONG ulStringLen, char cHardcr, char cSoftcr ) +static char * hb_strMemotran( char * pszResult, ULONG * ulResultLen, const char * pszString, ULONG ulStringLen, char cHardcr, char cSoftcr ) { ULONG ulStringPos = 0; ULONG ulResultPos = 0; diff --git a/harbour/source/rtl/natmsg.c b/harbour/source/rtl/natmsg.c index b91fa17d92..8d57b100c0 100644 --- a/harbour/source/rtl/natmsg.c +++ b/harbour/source/rtl/natmsg.c @@ -86,7 +86,7 @@ #define _LF_YN 12 /* "Y/N" */ /* NOTE: This must be in uppercase. [vszakats] */ #define _INVALID_EXPR 13 /* "INVALID EXPRESSION" */ -char * hb_nationGetMsg( USHORT uiMsg ) +static char * hb_nationGetMsg( USHORT uiMsg ) { HB_TRACE(HB_TR_DEBUG, ("hb_nationGetMsg(%hu)", uiMsg)); diff --git a/harbour/source/vm/estack.c b/harbour/source/vm/estack.c index a449622e61..139c2f2033 100644 --- a/harbour/source/vm/estack.c +++ b/harbour/source/vm/estack.c @@ -62,8 +62,6 @@ #include "hbapiitm.h" #include "hbapierr.h" -HB_EXTERN_BEGIN - /* ------------------------------- */ #if !defined( STACK_INITHB_ITEMS ) @@ -179,7 +177,6 @@ void hb_stackIncrease( void ) EndIndex = hb_stack.pEnd - hb_stack.pItems; /* no, make more headroom: */ - /* hb_stackDispLocal(); */ hb_stack.pItems = ( PHB_ITEM * ) hb_xrealloc( ( void * ) hb_stack.pItems, sizeof( PHB_ITEM ) * ( hb_stack.wItems + STACK_EXPANDHB_ITEMS ) ); @@ -293,12 +290,6 @@ HB_ITEM_PTR hb_stackItemFromBase( int nFromBase ) return ( * ( hb_stack.pBase + nFromBase + 1 ) ); } -#undef hb_stackTopItem -HB_ITEM_PTR hb_stackTopItem( void ) -{ - return * hb_stack.pPos; -} - #undef hb_stackBaseItem HB_ITEM_PTR hb_stackBaseItem( void ) { @@ -634,5 +625,3 @@ ULONG _System OS2TermHandler(PEXCEPTIONREPORTRECORD p1, return XCPT_CONTINUE_SEARCH; /* Exception not resolved... */ } #endif - -HB_EXTERN_END diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c index dcb1871393..62d1b82b5d 100644 --- a/harbour/source/vm/extend.c +++ b/harbour/source/vm/extend.c @@ -78,8 +78,6 @@ /* NOTE: iParam = -1 can be used to access the return value. */ /* NOTE: iParam = 0 can be used to access the SELF object. */ -HB_EXTERN_BEGIN - HB_EXPORT PHB_ITEM hb_param( int iParam, long lMask ) { HB_TRACE(HB_TR_DEBUG, ("hb_param(%d, %ld)", iParam, lMask)); @@ -725,20 +723,6 @@ HB_EXPORT void hb_retclen_buffer( char * szText, ULONG ulLen ) hb_itemPutCPtr( hb_stackReturnItem(), szText, ulLen ); } -#undef hb_retcAdopt -HB_EXPORT void hb_retcAdopt( char * szText ) -{ - /* - * This functions "adopts" passed pointer to buffer containing a string - * as a value of item of string type - * - * Copied from xHarbour - */ - HB_TRACE_STEALTH( HB_TR_INFO, ("hb_retcAdopt(%s)", szText ) ); - - hb_itemPutCPtr( hb_stackReturnItem(), szText, strlen( szText ) ); -} - /* szDate must have YYYYMMDD format */ #undef hb_retds @@ -1233,5 +1217,3 @@ HB_EXPORT int hb_pcount( void ) return ( int ) ( hb_stackBaseItem() )->item.asSymbol.paramcnt; } - -HB_EXTERN_END diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index e39f79ada6..c203713cb4 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -293,10 +293,10 @@ static PHB_FUNC_LIST s_ExitFunctions = NULL; This Exception Handler gets called in case of an abnormal termination of an harbour program and displays a full stack trace at the harbour language level */ #if defined(HB_OS_OS2) -ULONG _System OS2TermHandler(PEXCEPTIONREPORTRECORD p1, - PEXCEPTIONREGISTRATIONRECORD p2, - PCONTEXTRECORD p3, - PVOID pv); +extern ULONG _System OS2TermHandler(PEXCEPTIONREPORTRECORD p1, + PEXCEPTIONREGISTRATIONRECORD p2, + PCONTEXTRECORD p3, + PVOID pv); #endif HB_EXPORT void hb_vmAtInit( HB_INIT_FUNC pFunc, void * cargo ) diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c index d4413ec392..15261085dc 100644 --- a/harbour/source/vm/runner.c +++ b/harbour/source/vm/runner.c @@ -98,15 +98,6 @@ typedef struct #define SYM_EXTERN 2 /* Prev. defined function */ #define SYM_NOT_FOUND 0xFFFFFFFFUL /* Symbol not found. */ -/* -HB_EXTERN_BEGIN -HB_EXPORT PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ); -HB_EXPORT PHRB_BODY hb_hrbLoadFromFile( char* szHrb ); -HB_EXPORT void hb_hrbDo( PHRB_BODY pHrbBody, int argc, char * argv[] ); -HB_EXPORT void hb_hrbUnLoad( PHRB_BODY pHrbBody ); -HB_EXTERN_END -*/ - static int hb_hrbReadHead( char * szBody, ULONG ulBodySize, ULONG * pulBodyOffset ) { BYTE szHead[] = { (BYTE)192,'H','R','B' }; @@ -266,7 +257,7 @@ static void hb_hrbExit( PHRB_BODY pHrbBody ) } } -void hb_hrbUnLoad( PHRB_BODY pHrbBody ) +static void hb_hrbUnLoad( PHRB_BODY pHrbBody ) { ULONG ul; @@ -307,7 +298,7 @@ void hb_hrbUnLoad( PHRB_BODY pHrbBody ) hb_xfree( pHrbBody ); } -PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ) +static PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ) { PHRB_BODY pHrbBody = NULL; @@ -487,7 +478,7 @@ PHRB_BODY hb_hrbLoad( char* szHrbBody, ULONG ulBodySize ) return pHrbBody; } -PHRB_BODY hb_hrbLoadFromFile( char* szHrb ) +static PHRB_BODY hb_hrbLoadFromFile( char* szHrb ) { char szFileName[ _POSIX_PATH_MAX + 1 ]; PHRB_BODY pHrbBody = NULL; @@ -537,7 +528,7 @@ PHRB_BODY hb_hrbLoadFromFile( char* szHrb ) return pHrbBody; } -void hb_hrbDo( PHRB_BODY pHrbBody, int argc, char * argv[] ) +static void hb_hrbDo( PHRB_BODY pHrbBody, int argc, char * argv[] ) { PHB_ITEM pRetVal = NULL; int i; diff --git a/harbour/utils/hbver/hbverfix.c b/harbour/utils/hbver/hbverfix.c index 2e10436203..d6714d11f5 100644 --- a/harbour/utils/hbver/hbverfix.c +++ b/harbour/utils/hbver/hbverfix.c @@ -68,10 +68,10 @@ #define MAX_BUF_LEN 4096 -char * szIncrementNumber( char * szBuffer, size_t stSkipOver ) +static char * szIncrementNumber( char * szBuffer, size_t stSkipOver ) { size_t i; - for( i = stSkipOver; i < strlen( szBuffer ) && isspace( szBuffer[ i ] ); i++ ) {} + for( i = stSkipOver; i < strlen( szBuffer ) && isspace( ( BYTE ) szBuffer[ i ] ); i++ ) {} if( i > stSkipOver && i < strlen( szBuffer ) ) { int iVersion; @@ -87,7 +87,7 @@ char * szIncrementNumber( char * szBuffer, size_t stSkipOver ) return szBuffer; } -char * szReplaceQuoted( char * szBuffer, const char * new_string ) +static char * szReplaceQuoted( char * szBuffer, const char * new_string ) { char szOldBuf[ MAX_BUF_LEN ]; char * szOpening = strchr( szBuffer, 34 ); /* Locate starting quote */