diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4835f92be0..b0575f015c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-21 12:40 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/hbnf/any2any.prg + * optimized out macro + + * contrib/hbnf/fttext.c + * contrib/hbnf/hbnf.hbx + * deleted public function which was not there in original + in this form (it was ASM specific debug trick) + + * contrib/hbnf/asum.prg + * formatting + 2012-10-21 12:18 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib/hbformat/hbfmtcls.prg + added one known and one new minor TOFIX diff --git a/harbour/contrib/hbnf/any2any.prg b/harbour/contrib/hbnf/any2any.prg index 04c0dcc6a7..e174864c79 100644 --- a/harbour/contrib/hbnf/any2any.prg +++ b/harbour/contrib/hbnf/any2any.prg @@ -23,7 +23,6 @@ * */ -#define BLOCKIFY( x ) {|| x } #define CASE_AT( x, y, z ) z[ At( x, y ) + 1 ] #define NULL "" #define EARLIEST_DATE SToD( "01000101" ) @@ -105,7 +104,7 @@ FUNCTION FT_XTOY( xValueToConvert, cTypeToConvertTo, lWantYesNo ) CASE cTypeToConvertTo == "B" .AND. ; // They Want a Code Block ! HB_ISBLOCK( xValueToConvert ) - xValueToConvert := BLOCKIFY( xValueToConvert ) + xValueToConvert := {|| xValueToConvert } ENDCASE diff --git a/harbour/contrib/hbnf/asum.prg b/harbour/contrib/hbnf/asum.prg index cba34a3adb..4029b76991 100644 --- a/harbour/contrib/hbnf/asum.prg +++ b/harbour/contrib/hbnf/asum.prg @@ -41,8 +41,8 @@ FUNCTION FT_ASUM( aArray, nStartIndex, nEndIndex ) {| xElement | ; nSumTotal += ; CASE_AT( ValType( xElement ), "NC", ; - { 0, xElement, ; - iif( HB_ISSTRING( xElement ), Len( xElement ), 0 ) } ) }, ; - nStartIndex, nEndIndex - nStartIndex + 1 ) + { 0, xElement, ; + iif( HB_ISSTRING( xElement ), Len( xElement ), 0 ) } ) }, ; + nStartIndex, nEndIndex - nStartIndex + 1 ) RETURN nSumTotal diff --git a/harbour/contrib/hbnf/fttext.c b/harbour/contrib/hbnf/fttext.c index ef9ef6a4d7..c9471b85a2 100644 --- a/harbour/contrib/hbnf/fttext.c +++ b/harbour/contrib/hbnf/fttext.c @@ -164,7 +164,6 @@ typedef struct { int area; - int doInt; /* for debugging purposes */ /* arrays used by the text workareas */ long recno[ TEXT_WORKAREAS ]; HB_FOFFSET offset[ TEXT_WORKAREAS ]; @@ -181,8 +180,7 @@ static void s_fttext_init_init( void * cargo ) { PFT_TEXT ft_text = ( PFT_TEXT ) cargo; - ft_text->area = 0; - ft_text->doInt = 0; + ft_text->area = 0; } static HB_TSD_NEW( s_fttext, sizeof( FT_TEXT ), s_fttext_init_init, NULL ); @@ -196,13 +194,6 @@ static long _ft_skip( long recs ); static int _writeLine( PFT_TEXT ft_text, const char * theData, HB_SIZE iDataLen ); static HB_BOOL _writeeol( HB_FHANDLE fhnd ); -HB_FUNC( FTSETINT ) -{ - PFT_TEXT ft_text = ( PFT_TEXT ) hb_stackGetTSD( &s_fttext ); - - ft_text->doInt ^= 0xFF; -} - HB_FUNC( FT_FOFFSET ) { PFT_TEXT ft_text = ( PFT_TEXT ) hb_stackGetTSD( &s_fttext ); diff --git a/harbour/contrib/hbnf/hbnf.hbx b/harbour/contrib/hbnf/hbnf.hbx index 4eba8b49d3..64adb55f48 100644 --- a/harbour/contrib/hbnf/hbnf.hbx +++ b/harbour/contrib/hbnf/hbnf.hbx @@ -25,7 +25,6 @@ #command DYNAMIC => EXTERNAL #endif -DYNAMIC FTSETINT DYNAMIC FT_AADDITION DYNAMIC FT_AAVG DYNAMIC FT_ACCTADJ