diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 58be302ab4..faef845b7e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-06 12:05 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/xhb/cstructc.c + * contrib/xhb/dbf2txt.c + * contrib/xhb/fparse.c + * contrib/xhb/hbxml.c + * contrib/xhb/xhbis.c + * minor formatting + * use ',' instead of 44 + + * extras/gtwvw/gtwvw.c + ! fixed one code line after uncrustify + 2012-10-06 02:14 UTC+0200 Viktor Szakats (harbour syenar.net) * src/rtl/browse.prg * use K_* constant diff --git a/harbour/contrib/xhb/cstructc.c b/harbour/contrib/xhb/cstructc.c index 6a00c77765..f812d12238 100644 --- a/harbour/contrib/xhb/cstructc.c +++ b/harbour/contrib/xhb/cstructc.c @@ -296,7 +296,7 @@ static HB_BYTE * ArrayToStructure( PHB_ITEM aVar, PHB_ITEM aDef, HB_UINT uiAlign HB_UINT uiOffset = 0, uiMemberSize; HB_BYTE cShift; - *puiSize = SizeOfCStructure( aDef, uiAlign ) ; + *puiSize = SizeOfCStructure( aDef, uiAlign ); /* printf( "Size: %i\n", *puiSize ); */ @@ -1283,7 +1283,7 @@ static PHB_ITEM StructureToArray( HB_BYTE* Buffer, HB_SIZE nBufferLen, PHB_ITEM default: { - HB_UINT uiNestedSize /*, uiNestedAlign */ ; + HB_UINT uiNestedSize /*, uiNestedAlign */; PHB_ITEM pID = hb_itemPutNI( NULL, ( pBaseDef->pItems + nIndex )->item.asInteger.value ); PHB_ITEM pStructure = hb_itemDoC( "HB_CSTRUCTUREFROMID", 1, pID ); diff --git a/harbour/contrib/xhb/dbf2txt.c b/harbour/contrib/xhb/dbf2txt.c index 8230e212c6..84b6a1740e 100644 --- a/harbour/contrib/xhb/dbf2txt.c +++ b/harbour/contrib/xhb/dbf2txt.c @@ -266,7 +266,7 @@ HB_FUNC( DBF2TEXT ) } if( nCount != -1 ) - nCount-- ; + nCount--; /* DBSKIP() */ SELF_SKIP( pArea, 1 ); diff --git a/harbour/contrib/xhb/fparse.c b/harbour/contrib/xhb/fparse.c index ce13d810d6..0976b50871 100644 --- a/harbour/contrib/xhb/fparse.c +++ b/harbour/contrib/xhb/fparse.c @@ -90,7 +90,7 @@ static void hb_ParseLine( PHB_ITEM pReturn, const char * szText, int iDelimiter, { PHB_ITEM pTemp = hb_itemNew( NULL ); HB_ISIZ i = 0; - int word_count = 0 ; + int word_count = 0; /* booked enough memory */ char * szResult = ( char * ) hb_xgrab( nLen + 1 ); @@ -262,8 +262,8 @@ static void hb_ParseLine( PHB_ITEM pReturn, const char * szText, int iDelimiter, static char ** hb_tokensplit( const char * string, HB_BYTE delimiter, int iCharCount, int * iWord ) { - char *buffer, *bufptr; - char **token_list; + char * buffer, * bufptr; + char ** token_list; char last_char = '\0'; int word_count = 0, word_nbr; @@ -280,7 +280,7 @@ static char ** hb_tokensplit( const char * string, HB_BYTE delimiter, int iCharC string++; } - if(bufptr > buffer) + if( bufptr > buffer ) { word_count++; last_char = *bufptr++ = '\0'; @@ -353,13 +353,13 @@ static HB_BOOL file_read( FILE *stream, char *string, int *iCharCount ) HB_FUNC( FPARSE ) { - FILE *inFile ; + FILE * inFile; PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING ); PHB_ITEM pDelim = hb_param( 2, HB_IT_STRING ); PHB_ITEM pArray; PHB_ITEM pItem; - char *string ; - char **tokens; + char * string; + char ** tokens; int iToken, iCharCount = 0; HB_BYTE nByte; @@ -386,8 +386,8 @@ HB_FUNC( FPARSE ) return; } - /* default delimiter to comma, chr(44) */ - nByte = pDelim ? ( HB_BYTE ) hb_itemGetCPtr( pDelim )[ 0 ] : ( HB_BYTE ) 44; + /* default delimiter to comma */ + nByte = pDelim ? ( HB_BYTE ) hb_itemGetCPtr( pDelim )[ 0 ] : ( HB_BYTE ) ','; /* the main array */ pArray = hb_itemArrayNew( 0 ); @@ -431,12 +431,12 @@ HB_FUNC( FPARSE ) HB_FUNC( FPARSEEX ) { - FILE *inFile; + FILE * inFile; PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING ); PHB_ITEM pDelim = hb_param( 2, HB_IT_STRING ); PHB_ITEM pArray; PHB_ITEM pSubArray; - char *string; + char * string; int iCharCount = 0; HB_BYTE nByte; @@ -463,8 +463,8 @@ HB_FUNC( FPARSEEX ) return; } - /* default delimiter to comma, chr(44) */ - nByte = pDelim ? ( HB_BYTE ) hb_itemGetCPtr( pDelim )[ 0 ] : ( HB_BYTE ) 44; + /* default delimiter to comma */ + nByte = pDelim ? ( HB_BYTE ) hb_itemGetCPtr( pDelim )[ 0 ] : ( HB_BYTE ) ','; /* the main array */ pArray = hb_itemArrayNew( 0 ); @@ -497,9 +497,9 @@ HB_FUNC( FPARSEEX ) HB_FUNC( FWORDCOUNT ) { - FILE *inFile ; + FILE * inFile; PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING ); - char *string ; + char *string; char **tokens; int iCharCount = 0; HB_BYTE nByte = ' '; @@ -556,7 +556,7 @@ HB_FUNC( FWORDCOUNT ) HB_FUNC( FLINECOUNT ) { - FILE *inFile ; + FILE * inFile; PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING ); HB_SIZE nLineCount = 0; int ch; @@ -602,7 +602,7 @@ HB_FUNC( FLINECOUNT ) HB_FUNC( FCHARCOUNT ) { - FILE *inFile; + FILE * inFile; PHB_ITEM pSrc = hb_param( 1, HB_IT_STRING ); HB_SIZE nResult = 0; int ch; @@ -635,9 +635,9 @@ HB_FUNC( FCHARCOUNT ) { switch( ch ) { - case '\n' : - case '\r' : - case ' ' : + case '\n': + case '\r': + case ' ': case '\t': break; default: diff --git a/harbour/contrib/xhb/hbxml.c b/harbour/contrib/xhb/hbxml.c index 1d160e3d74..5667757d3a 100644 --- a/harbour/contrib/xhb/hbxml.c +++ b/harbour/contrib/xhb/hbxml.c @@ -1078,7 +1078,7 @@ static void mxml_node_read_pi( MXML_REFIL * ref, PHB_ITEM pNode, PHB_ITEM doc ) /* and then we'll put all the "data" into the data member, up to ?> */ buf = ( char * ) MXML_ALLOCATOR( MXML_ALLOC_BLOCK ); - iAllocated = MXML_ALLOC_BLOCK ; + iAllocated = MXML_ALLOC_BLOCK; while( iStatus < 2 ) { @@ -1195,7 +1195,7 @@ static void mxml_node_read_comment( MXML_REFIL * ref, PHB_ITEM pNode, PHB_ITEM d /* we'll put all the comment into the data member, up to -> */ buf = ( char * ) MXML_ALLOCATOR( MXML_ALLOC_BLOCK ); - iAllocated = MXML_ALLOC_BLOCK ; + iAllocated = MXML_ALLOC_BLOCK; while( iStatus < 3 ) { @@ -1375,7 +1375,7 @@ static void mxml_node_read_cdata( MXML_REFIL * ref, PHB_ITEM pNode, PHB_ITEM pDo iStatus = 0; buf = ( char * ) MXML_ALLOCATOR( MXML_ALLOC_BLOCK ); - iAllocated = MXML_ALLOC_BLOCK ; + iAllocated = MXML_ALLOC_BLOCK; /* now we can read the node */ while( iStatus < 3 ) diff --git a/harbour/contrib/xhb/xhbis.c b/harbour/contrib/xhb/xhbis.c index 24f3aa0fac..974b063fba 100644 --- a/harbour/contrib/xhb/xhbis.c +++ b/harbour/contrib/xhb/xhbis.c @@ -161,7 +161,7 @@ HB_FUNC( ISPRINT ) { const char * szString = hb_parc( 1 ); - hb_retl( szString && isprint( ( HB_BYTE ) * szString ) ) ; + hb_retl( szString && isprint( ( HB_BYTE ) * szString ) ); } /* determines if first char of a string is a punctuation character. diff --git a/harbour/extras/gtwvw/gtwvw.c b/harbour/extras/gtwvw/gtwvw.c index fddd82ce27..d1436c98b5 100644 --- a/harbour/extras/gtwvw/gtwvw.c +++ b/harbour/extras/gtwvw/gtwvw.c @@ -6797,7 +6797,7 @@ static void hb_gt_wvwFillLineSpace( WIN_DATA * pWindowData, HDC hdc, USHORT star HBRUSH hBrush; int byColorIndex = pWindowData->iLSpaceColor < 0 ? - ( byAttrib& 0x00F0 )> > 4 : + ( byAttrib & 0x00F0 ) >> 4 : pWindowData->iLSpaceColor; COLORREF bkColor = _COLORS[ byColorIndex ];