diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7005227b93..2d9fd19085 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-11 23:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/hbc.cfg + + Enabled alignment of PP definitions. + ! Tabs -> spaces. + + * contrib/hbmisc/spd.c + * contrib/hbmisc/stringsx.c + * Reformatted to Harbour standard using uncrustify tool. + 2010-12-11 23:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hblzf/hblzf.c % Removed unnecessary casts readded in last commit. diff --git a/harbour/config/hbc.cfg b/harbour/config/hbc.cfg index 59cfbda1d5..ec0dd51e57 100644 --- a/harbour/config/hbc.cfg +++ b/harbour/config/hbc.cfg @@ -2,50 +2,54 @@ # $Id$ # -# uncrustify config file for Harbour C/C++ sources. +# --------------------------------------------------------------- +# uncrustify config file for Harbour Project C/C++ sources. # http://uncrustify.sourceforge.net/ +# +# Viktor Szakats (harbour.01 syenar.hu) +# --------------------------------------------------------------- -indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs -align_with_tabs = false # use tabs to align -align_on_tabstop = TRUE # align on tabstops -input_tab_size = 8 # original tab size -output_tab_size = 3 # new tab size -indent_columns = output_tab_size +indent_with_tabs = 0 # 1=indent to level only, 2=indent with tabs +align_with_tabs = false # use tabs to align +align_on_tabstop = TRUE # align on tabstops +input_tab_size = 8 # original tab size +output_tab_size = 3 # new tab size +indent_columns = output_tab_size -indent_label = 2 # pos: absolute col, neg: relative column +indent_label = 2 # pos: absolute col, neg: relative column # # inter-symbol newlines # -nl_enum_brace = force # "enum {" vs "enum \n {" -nl_union_brace = force # "union {" vs "union \n {" -nl_struct_brace = force # "struct {" vs "struct \n {" -nl_do_brace = force # "do {" vs "do \n {" -nl_if_brace = force # "if () {" vs "if () \n {" -nl_for_brace = force # "for () {" vs "for () \n {" -nl_else_brace = force # "else {" vs "else \n {" -nl_while_brace = force # "while () {" vs "while () \n {" -nl_switch_brace = force # "switch () {" vs "switch () \n {" -nl_brace_while = force # "} while" vs "} \n while" - cuddle while -nl_brace_else = force # "} else" vs "} \n else" - cuddle else -nl_func_var_def_blk = 1 -nl_fcall_brace = force # "list_for_each() {" vs "list_for_each()\n{" -nl_fdef_brace = force # "int foo() {" vs "int foo()\n{" -# nl_after_return = TRUE; -# nl_before_case = 1 +nl_enum_brace = force # "enum {" vs "enum \n {" +nl_union_brace = force # "union {" vs "union \n {" +nl_struct_brace = force # "struct {" vs "struct \n {" +nl_do_brace = force # "do {" vs "do \n {" +nl_if_brace = force # "if () {" vs "if () \n {" +nl_for_brace = force # "for () {" vs "for () \n {" +nl_else_brace = force # "else {" vs "else \n {" +nl_while_brace = force # "while () {" vs "while () \n {" +nl_switch_brace = force # "switch () {" vs "switch () \n {" +nl_brace_while = force # "} while" vs "} \n while" - cuddle while +nl_brace_else = force # "} else" vs "} \n else" - cuddle else +nl_func_var_def_blk = 1 +nl_fcall_brace = force # "list_for_each() {" vs "list_for_each()\n{" +nl_fdef_brace = force # "int foo() {" vs "int foo()\n{" +# nl_after_return = TRUE; +# nl_before_case = 1 # # Source code modifications # -mod_paren_on_return = remove # "return 1;" vs "return (1);" -# mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" -# mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" -# mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" -# mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" +mod_paren_on_return = remove # "return 1;" vs "return (1);" +# mod_full_brace_if = remove # "if (a) a--;" vs "if (a) { a--; }" +# mod_full_brace_for = remove # "for () a--;" vs "for () { a--; }" +# mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" +# mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" # Add or remove braces on single-line 'do' statement mod_full_brace_do = force # ignore/add/remove/force @@ -125,23 +129,23 @@ mod_remove_empty_return = true # false/true # inter-character spacing options # -# sp_return_paren = force # "return (1);" vs "return(1);" -sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" -sp_before_sparen = remove # "if (" vs "if(" -sp_after_sparen = force # "if () {" vs "if (){" -sp_after_cast = force # "(int) a" vs "(int)a" -sp_inside_braces = add # "{ 1 }" vs "{1}" -sp_inside_braces_struct = add # "{ 1 }" vs "{1}" -sp_inside_braces_enum = add # "{ 1 }" vs "{1}" -sp_assign = add -sp_arith = add -sp_bool = add -sp_compare = add -sp_assign = add -sp_after_comma = add -sp_func_def_paren = remove # "int foo (){" vs "int foo(){" -sp_func_call_paren = remove # "foo (" vs "foo(" -sp_func_proto_paren = remove # "int foo ();" vs "int foo();" +# sp_return_paren = force # "return (1);" vs "return(1);" +sp_sizeof_paren = remove # "sizeof (int)" vs "sizeof(int)" +sp_before_sparen = remove # "if (" vs "if(" +sp_after_sparen = force # "if () {" vs "if (){" +sp_after_cast = force # "(int) a" vs "(int)a" +sp_inside_braces = add # "{ 1 }" vs "{1}" +sp_inside_braces_struct = add # "{ 1 }" vs "{1}" +sp_inside_braces_enum = add # "{ 1 }" vs "{1}" +sp_assign = add +sp_arith = add +sp_bool = add +sp_compare = add +sp_assign = add +sp_after_comma = add +sp_func_def_paren = remove # "int foo (){" vs "int foo(){" +sp_func_call_paren = remove # "foo (" vs "foo(" +sp_func_proto_paren = remove # "int foo ();" vs "int foo();" # # Spacing options @@ -548,21 +552,21 @@ sp_endif_cmt = ignore # ignore/add/remove/force # Aligning stuff # -align_enum_equ_span = 4 # '=' in enum definition -# align_nl_cont = TRUE -align_var_def_span = 3 -# align_var_def_inline = TRUE -# align_var_def_star = FALSE -# align_var_def_colon = TRUE -# align_assign_span = 1 -align_struct_init_span = 3 # align stuff in a structure init '= { }' -align_right_cmt_span = 3 -# align_pp_define_span = 8; -# align_pp_define_gap = 4; +align_enum_equ_span = 4 # '=' in enum definition +# align_nl_cont = TRUE +align_var_def_span = 3 +# align_var_def_inline = TRUE +# align_var_def_star = FALSE +# align_var_def_colon = TRUE +# align_assign_span = 1 +align_struct_init_span = 3 # align stuff in a structure init '= { }' +align_right_cmt_span = 3 +align_pp_define_span = 8; +# align_pp_define_gap = 4; -# cmt_star_cont = FALSE +# cmt_star_cont = FALSE -# indent_brace = 0 +# indent_brace = 0 # diff --git a/harbour/contrib/hbmisc/spd.c b/harbour/contrib/hbmisc/spd.c index 8023beea38..1eb17af826 100644 --- a/harbour/contrib/hbmisc/spd.c +++ b/harbour/contrib/hbmisc/spd.c @@ -57,24 +57,30 @@ static void STAItm( PHB_ITEM pItmPar ) { - HB_UINT i, ulItmPar = ( HB_UINT ) hb_itemGetCLen( pItmPar ); - const char *cItmPar = hb_itemGetCPtr( pItmPar ), *c; - char *cRes; + HB_UINT i, ulItmPar = ( HB_UINT ) hb_itemGetCLen( pItmPar ); + const char * cItmPar = hb_itemGetCPtr( pItmPar ), * c; + char * cRes; - for( i = 3, c = cItmPar; *c; c++ ){ - if( *c == '\'' ) i++; /* Count ' Tokens */ + for( i = 3, c = cItmPar; *c; c++ ) + { + if( *c == '\'' ) + i++; /* Count ' Tokens */ } - cRes = (char *)hb_xgrab( ulItmPar + i * sizeof(char) ); - i = 0; c = cItmPar; cRes[i++] = '\''; - while( *c ){ - if( *c == '\'' ) cRes[i++] = '\''; - cRes[i++] = *c++; + cRes = ( char * ) hb_xgrab( ulItmPar + i * sizeof( char ) ); + i = 0; c = cItmPar; cRes[ i++ ] = '\''; + while( *c ) + { + if( *c == '\'' ) + cRes[ i++ ] = '\''; + cRes[ i++ ] = *c++; } - cRes[i++] = '\''; /* cRes[i] = '\0'; */ + cRes[ i++ ] = '\''; /* cRes[i] = '\0'; */ hb_itemPutCLPtr( pItmPar, cRes, i ); } -static HB_UINT SCItm( char *cBuffer, HB_UINT ulMaxBuf, char *cParFrm, int iCOut, int IsIndW, int iIndWidth, int IsIndP, int iIndPrec, PHB_ITEM pItmPar ) +static HB_UINT SCItm( char * cBuffer, HB_UINT ulMaxBuf, char * cParFrm, int iCOut, int IsIndW, + int iIndWidth, int IsIndP, int iIndPrec, + PHB_ITEM pItmPar ) { HB_UINT s; @@ -82,11 +88,13 @@ static HB_UINT SCItm( char *cBuffer, HB_UINT ulMaxBuf, char *cParFrm, int iCOut, makes ulMaxBuf unused, and this in turn causes a warning, so we're manually suppressing it. [vszakats] */ #if defined( __DJGPP__ ) - HB_SYMBOL_UNUSED( ulMaxBuf ); + HB_SYMBOL_UNUSED( ulMaxBuf ); #endif - if( IsIndW && IsIndP ){ - switch( iCOut ){ + if( IsIndW && IsIndP ) + { + switch( iCOut ) + { case 'p': s = hb_snprintf( cBuffer, ulMaxBuf, cParFrm, iIndWidth, iIndPrec, hb_itemGetPtr( pItmPar ) ); break; @@ -98,12 +106,17 @@ static HB_UINT SCItm( char *cBuffer, HB_UINT ulMaxBuf, char *cParFrm, int iCOut, break; /* case 'c': case 'C': case 'd': case 'i': case 'o': case 'u': case 'x': case 'X': */ default: - s = hb_snprintf( cBuffer, ulMaxBuf, cParFrm, iIndWidth, iIndPrec, (HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar )) ); + s = + hb_snprintf( cBuffer, ulMaxBuf, cParFrm, iIndWidth, iIndPrec, + ( HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar ) ) ); } - }else if( IsIndW || IsIndP ){ - int iInd = (IsIndW ? iIndWidth : iIndPrec); + } + else if( IsIndW || IsIndP ) + { + int iInd = ( IsIndW ? iIndWidth : iIndPrec ); - switch( iCOut ){ + switch( iCOut ) + { case 'p': s = hb_snprintf( cBuffer, ulMaxBuf, cParFrm, iInd, hb_itemGetPtr( pItmPar ) ); break; @@ -115,10 +128,15 @@ static HB_UINT SCItm( char *cBuffer, HB_UINT ulMaxBuf, char *cParFrm, int iCOut, break; /* case 'c': case 'C': case 'd': case 'i': case 'o': case 'u': case 'x': case 'X': */ default: - s = hb_snprintf( cBuffer, ulMaxBuf, cParFrm, iInd, (HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar )) ); + s = + hb_snprintf( cBuffer, ulMaxBuf, cParFrm, iInd, + ( HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar ) ) ); } - }else{ - switch( iCOut ){ + } + else + { + switch( iCOut ) + { case 'p': s = hb_snprintf( cBuffer, ulMaxBuf, cParFrm, hb_itemGetPtr( pItmPar ) ); break; @@ -130,7 +148,9 @@ static HB_UINT SCItm( char *cBuffer, HB_UINT ulMaxBuf, char *cParFrm, int iCOut, break; /* case 'c': case 'C': case 'd': case 'i': case 'o': case 'u': case 'x': case 'X': */ default: - s = hb_snprintf( cBuffer, ulMaxBuf, cParFrm, (HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar )) ); + s = + hb_snprintf( cBuffer, ulMaxBuf, cParFrm, + ( HB_IS_LONG( pItmPar ) ? hb_itemGetNL( pItmPar ) : hb_itemGetNI( pItmPar ) ) ); } } return s; @@ -178,197 +198,295 @@ static HB_UINT SCItm( char *cBuffer, HB_UINT ulMaxBuf, char *cParFrm, int iCOut, * Processing %% and n converter Position. *******************************************************************************/ -#define DK_INCRES 1024 -#define DK_INCBUF 512 -#define DK_BLKBUF HB_MAX_DOUBLE_LENGTH /* Expense of DK_INCBUF */ -#define DK_EMPTYDATE "'0001-01-01 BC'" -#define DK_EMPTYDATETIME "'0001-01-01 00:00:00 BC'" +#define DK_INCRES 1024 +#define DK_INCBUF 512 +#define DK_BLKBUF HB_MAX_DOUBLE_LENGTH /* Expense of DK_INCBUF */ +#define DK_EMPTYDATE "'0001-01-01 BC'" +#define DK_EMPTYDATETIME "'0001-01-01 00:00:00 BC'" HB_FUNC( SQL_SPRINTF ) { - HB_UINT ulItmFrm; - const char *cItmFrm; - char *cRes; - int argc = hb_pcount() - 1; - PHB_ITEM pItmFrm = hb_param( 1, HB_IT_STRING ); + HB_UINT ulItmFrm; + const char * cItmFrm; + char * cRes; + int argc = hb_pcount() - 1; + PHB_ITEM pItmFrm = hb_param( 1, HB_IT_STRING ); - if( !pItmFrm || (cItmFrm = hb_itemGetCPtr( pItmFrm )) == NULL ){ + if( ! pItmFrm || ( cItmFrm = hb_itemGetCPtr( pItmFrm ) ) == NULL ) + { hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - }else if( (ulItmFrm = ( HB_UINT ) hb_itemGetCLen( pItmFrm )) == 0 ){ + } + else if( ( ulItmFrm = ( HB_UINT ) hb_itemGetCLen( pItmFrm ) ) == 0 ) + { hb_retc_null(); - }else if( !argc ){ - cRes = (char *)hb_xgrab( ulItmFrm + sizeof(char) ); - memcpy( cRes, cItmFrm, ulItmFrm + sizeof(char) ); + } + else if( ! argc ) + { + cRes = ( char * ) hb_xgrab( ulItmFrm + sizeof( char ) ); + memcpy( cRes, cItmFrm, ulItmFrm + sizeof( char ) ); hb_retclen_buffer( cRes, ulItmFrm ); - }else{ - PHB_ITEM pItmPar, pItmCpy; - char *cIntMod, *cBuffer, *cParFrm; - const char *c; - int p, arg, iCOut, IsType, IsIndW, IsIndP, iIndWidth, iIndPrec, iErrorPar = 0; - HB_UINT s, f, i, ulWidth, ulParPos = 0, ulResPos = 0, ulMaxBuf = DK_INCBUF, ulMaxRes = DK_INCRES; - static char cToken[] = "stTcdiouxXaAeEfgGpnSC"; + } + else + { + PHB_ITEM pItmPar, pItmCpy; + char * cIntMod, * cBuffer, * cParFrm; + const char * c; + int p, arg, iCOut, IsType, IsIndW, IsIndP, iIndWidth, iIndPrec, iErrorPar = 0; + HB_UINT s, f, i, ulWidth, ulParPos = 0, ulResPos = 0, ulMaxBuf = DK_INCBUF, ulMaxRes = + DK_INCRES; + static char cToken[] = "stTcdiouxXaAeEfgGpnSC"; cIntMod = NULL; - cRes = (char *)hb_xgrab( ulMaxRes ); - cBuffer = (char *)hb_xgrab( ulMaxBuf ); - cParFrm = (char *)hb_xgrab( ulItmFrm + sizeof(char) ); + cRes = ( char * ) hb_xgrab( ulMaxRes ); + cBuffer = ( char * ) hb_xgrab( ulMaxBuf ); + cParFrm = ( char * ) hb_xgrab( ulItmFrm + sizeof( char ) ); - for( p = 0; p < argc; /* Not p++ by support index & indirect arguments */ ){ + for( p = 0; p < argc; /* Not p++ by support index & indirect arguments */ ) + { c = cItmFrm + ulParPos; s = f = i = ulWidth = arg = iCOut = IsType = IsIndW = iIndWidth = IsIndP = iIndPrec = 0; - do{ /* Get Par Format */ - cParFrm[i++] = *c; - if( f && *c == '%' ){ + do /* Get Par Format */ + { + cParFrm[ i++ ] = *c; + if( f && *c == '%' ) + { f = ulWidth = IsIndW = IsIndP = 0; - }else if( f && !ulWidth && *c >= '0' && *c <= '9' ){ + } + else if( f && ! ulWidth && *c >= '0' && *c <= '9' ) + { ulWidth = atol( c ); - }else if( f && *c == '.' ){ - if( f++ == 2 ) iErrorPar = 1; - }else if( f && *c == '*' ){ - if( f == 2 ){ - if( IsIndP ){ + } + else if( f && *c == '.' ) + { + if( f++ == 2 ) + iErrorPar = 1; + } + else if( f && *c == '*' ) + { + if( f == 2 ) + { + if( IsIndP ) + { f = 3; iErrorPar = 1; - }else{ + } + else + { IsIndP = 1; } - }else if( !IsIndW ){ + } + else if( ! IsIndW ) + { IsIndW = 1; - }else{ + } + else + { f = 3; iErrorPar = 1; } - }else if( f && *c == '$' ){ - if( ulWidth && IsIndP && !iIndPrec ){ + } + else if( f && *c == '$' ) + { + if( ulWidth && IsIndP && ! iIndPrec ) + { iIndPrec = ulWidth; iCOut = '*'; - }else if( ulWidth && IsIndW && !iIndWidth ){ + } + else if( ulWidth && IsIndW && ! iIndWidth ) + { iIndWidth = ulWidth; ulWidth = 0; iCOut = '*'; - }else if( ulWidth && !arg ){ + } + else if( ulWidth && ! arg ) + { arg = ulWidth; ulWidth = 0; iCOut = '%'; - }else{ + } + else + { f = 3; iErrorPar = 1; } - while( i && cParFrm[--i] != iCOut ) {}; + while( i && cParFrm[ --i ] != iCOut ) + { + } + ; ++i; iCOut = 0; - }else if( f && *c == '{' ){ - if( s ){ + } + else if( f && *c == '{' ) + { + if( s ) + { f = 3; iErrorPar = 1; - }else{ /* Remove Internal Modifier */ - if( cIntMod == NULL ){ - cIntMod = (char *)hb_xgrab( ulItmFrm + sizeof(char) ); + } + else /* Remove Internal Modifier */ + { + if( cIntMod == NULL ) + { + cIntMod = ( char * ) hb_xgrab( ulItmFrm + sizeof( char ) ); } - while( *c++ && *c != '}' ) cIntMod[s++] = *c; - --i; cIntMod[s] = '\0'; - if( *(c - 1) == '\0' ){ + while( *c++ && *c != '}' ) + cIntMod[ s++ ] = *c; + --i; cIntMod[ s ] = '\0'; + if( *( c - 1 ) == '\0' ) + { f = 3; iErrorPar = 1; } } - }else if( f && strchr(cToken, *c) ){ + } + else if( f && strchr( cToken, *c ) ) + { f = 3; iCOut = *c; - }else if( *c == '%' ){ + } + else if( *c == '%' ) + { f = 1; } c++; - }while( f < 3 && *c ); cParFrm[f = i] = '\0'; - if( iErrorPar ) break; + } + while( f < 3 && *c ); cParFrm[ f = i ] = '\0'; + if( iErrorPar ) + break; - if( iCOut == 't' || iCOut == 'T' ){ - if( cParFrm[f - 2] == '%' ){ - IsType = (iCOut == 'T' ? 2 : 1); iCOut = cParFrm[f - 1] = 's'; - }else{ + if( iCOut == 't' || iCOut == 'T' ) + { + if( cParFrm[ f - 2 ] == '%' ) + { + IsType = ( iCOut == 'T' ? 2 : 1 ); iCOut = cParFrm[ f - 1 ] = 's'; + } + else + { iErrorPar = 1; break; } } - if( IsIndW ){ /* Get Par Indirectly Width Item */ - pItmPar = hb_param( (iIndWidth ? iIndWidth + 1 : p++ + 2), HB_IT_INTEGER ); - if( pItmPar ){ - if( (iIndWidth = hb_itemGetNI( pItmPar )) < 0 ){ + if( IsIndW ) /* Get Par Indirectly Width Item */ + { + pItmPar = hb_param( ( iIndWidth ? iIndWidth + 1 : p++ + 2 ), HB_IT_INTEGER ); + if( pItmPar ) + { + if( ( iIndWidth = hb_itemGetNI( pItmPar ) ) < 0 ) + { ulWidth = -iIndWidth; - }else{ + } + else + { ulWidth = iIndWidth; } - }else{ + } + else + { iErrorPar = 1; break; } } - if( IsIndP ){ /* Get Par Indirectly Precision Item */ - pItmPar = hb_param( (iIndPrec ? iIndPrec + 1 : p++ + 2), HB_IT_INTEGER ); - if( pItmPar ){ + if( IsIndP ) /* Get Par Indirectly Precision Item */ + { + pItmPar = hb_param( ( iIndPrec ? iIndPrec + 1 : p++ + 2 ), HB_IT_INTEGER ); + if( pItmPar ) + { iIndPrec = hb_itemGetNI( pItmPar ); - }else{ + } + else + { iErrorPar = 1; break; } } - if( !arg && *c && p == argc - 1 ){ /* No more Par Items */ - do{ cParFrm[i++] = *c; }while( *c++ ); i--; + if( ! arg && *c && p == argc - 1 ) /* No more Par Items */ + { + do + { + cParFrm[ i++ ] = *c; + } + while( *c++ ); i--; } /* i == strlen(cParFrm) */ - pItmPar = hb_param( (arg ? arg + 1 : p++ + 2), HB_IT_ANY ); /* Get Par Item */ - if( !pItmPar ){ + pItmPar = hb_param( ( arg ? arg + 1 : p++ + 2 ), HB_IT_ANY ); /* Get Par Item */ + if( ! pItmPar ) + { iErrorPar = 1; break; } - if( !iCOut || iCOut == 'n' ){ /* Par Text Out */ + if( ! iCOut || iCOut == 'n' ) /* Par Text Out */ - for( f = i, i = 0; i < f; i++ ){ /* Change %% with % */ - if( cParFrm[i] == '%' && cParFrm[i + 1] == '%' ){ + { + for( f = i, i = 0; i < f; i++ ) /* Change %% with % */ + { + if( cParFrm[ i ] == '%' && cParFrm[ i + 1 ] == '%' ) + { memcpy( cParFrm + i, cParFrm + i + 1, f - i ); f--; } } /* i == strlen(cParFrm) */ - if( iCOut ){ - for( f = 0; f < i; f++ ){ /* Erase %n */ - if( cParFrm[f] == '%' && cParFrm[f + 1] == 'n' ){ + if( iCOut ) + { + for( f = 0; f < i; f++ ) /* Erase %n */ + { + if( cParFrm[ f ] == '%' && cParFrm[ f + 1 ] == 'n' ) + { memcpy( cParFrm + f, cParFrm + f + 2, i - f - 1 ); break; } } /* f == Index % of n */ - if( f < i ){ + if( f < i ) + { i -= 2; /* i == strlen(cParFrm) */ hb_itemPutNS( pItmPar, ulResPos + f ); - }else{ + } + else + { iErrorPar = 1; break; } } - if( (f = i + sizeof(char)) > ulMaxBuf ){ + if( ( f = i + sizeof( char ) ) > ulMaxBuf ) + { ulMaxBuf += f + DK_INCBUF; - cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf ); + cBuffer = ( char * ) hb_xrealloc( cBuffer, ulMaxBuf ); } hb_strncpy( cBuffer, cParFrm, i ); s = i; - }else{ /* Par Item sprintf() Out */ + } + else /* Par Item sprintf() Out */ + { # ifdef HB_IT_NULL - if( (HB_IS_NIL( pItmPar ) || HB_IS_NULL( pItmPar )) ){ + if( ( HB_IS_NIL( pItmPar ) || HB_IS_NULL( pItmPar ) ) ) + { # else - if( HB_IS_NIL( pItmPar ) ){ + if( HB_IS_NIL( pItmPar ) ) + { # endif ulWidth = f; IsIndW = IsIndP = 0; - while( cParFrm[--f] != '%' ) {}; - iCOut = cParFrm[f + 1] = 's'; /* Change format with %s */ + while( cParFrm[ --f ] != '%' ) + { + } + ; + iCOut = cParFrm[ f + 1 ] = 's'; /* Change format with %s */ memcpy( cParFrm + f + 2, cParFrm + ulWidth, i - ulWidth + 1 ); - i -= ulWidth - f - 2; /* i == strlen(cParFrm) */ - if( (f = i + 8) > ulMaxBuf ){ /* size of "DEFAULT" == 8 */ + i -= ulWidth - f - 2; /* i == strlen(cParFrm) */ + if( ( f = i + 8 ) > ulMaxBuf ) /* size of "DEFAULT" == 8 */ + { ulMaxBuf += f + DK_INCBUF; - cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf ); + cBuffer = ( char * ) hb_xrealloc( cBuffer, ulMaxBuf ); } pItmCpy = hb_itemNew( NULL ); # ifdef HB_IT_NULL - if( IsType == 2 && !HB_IS_NULL( pItmPar ) ) hb_itemPutCL( pItmCpy, "DEFAULT", 7 ); + if( IsType == 2 && ! HB_IS_NULL( pItmPar ) ) + hb_itemPutCL( pItmCpy, "DEFAULT", 7 ); # else /* Print DEFAULT if NIL for T converter if not NULL, print NULL for the rest of converters */ - if( IsType == 2 ) hb_itemPutCL( pItmCpy, "DEFAULT", 7 ); + if( IsType == 2 ) + hb_itemPutCL( pItmCpy, "DEFAULT", 7 ); # endif - else hb_itemPutCL( pItmCpy, "NULL", 4 ); - s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmCpy ); + else + hb_itemPutCL( pItmCpy, "NULL", 4 ); + s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, + pItmCpy ); hb_itemRelease( pItmCpy ); - }else if( HB_IS_STRING( pItmPar ) && (iCOut == 's' || iCOut == 'S') ){ - if( IsType ){ + } + else if( HB_IS_STRING( pItmPar ) && ( iCOut == 's' || iCOut == 'S' ) ) + { + if( IsType ) + { hb_itemCopy( pItmCpy = hb_itemNew( NULL ), pItmPar ); pItmPar = pItmCpy; if( IsType == 2 && hb_itemGetCLen( pItmPar ) == 0 ) /* 0 length string print DEFAULT for T converter */ hb_itemPutCL( pItmPar, "DEFAULT", 7 ); @@ -376,126 +494,188 @@ HB_FUNC( SQL_SPRINTF ) STAItm( pItmPar ); } f = ( HB_UINT ) hb_itemGetCLen( pItmPar ); - if( (f = i + HB_MAX(ulWidth, f)) > ulMaxBuf ){ + if( ( f = i + HB_MAX( ulWidth, f ) ) > ulMaxBuf ) + { ulMaxBuf += f + DK_INCBUF; - cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf ); + cBuffer = ( char * ) hb_xrealloc( cBuffer, ulMaxBuf ); } - s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar ); - if( IsType ) hb_itemRelease( pItmPar ); + s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, + pItmPar ); + if( IsType ) + hb_itemRelease( pItmPar ); - }else if( HB_IS_DATETIME( pItmPar ) && iCOut == 's' ){ - long lDate, lTime; - char cDTBuf[ 9 ], cDTFrm[ 27 ]; + } + else if( HB_IS_DATETIME( pItmPar ) && iCOut == 's' ) + { + long lDate, lTime; + char cDTBuf[ 9 ], cDTFrm[ 27 ]; - if( s ){ /* Internal Modifier */ - for( f = 0; cIntMod[f] && cIntMod[f] != ' '; f++ ) {}; - if( f != s ) cIntMod[f++] = '\0'; /* Date & Time */ + if( s ) /* Internal Modifier */ + { + for( f = 0; cIntMod[ f ] && cIntMod[ f ] != ' '; f++ ) + { + } + ; + if( f != s ) + cIntMod[ f++ ] = '\0'; /* Date & Time */ } - if( HB_IS_TIMESTAMP( pItmPar ) ){ + if( HB_IS_TIMESTAMP( pItmPar ) ) + { hb_itemGetTDT( pItmPar, &lDate, &lTime ); hb_timeStampFormat( cDTFrm, - (s ? cIntMod : (IsType ? "YYYY-MM-DD" : hb_setGetDateFormat())), - (s ? cIntMod + f : (IsType ? "HH:MM:SS" : hb_setGetTimeFormat())), + ( s ? cIntMod : ( IsType ? "YYYY-MM-DD" : + hb_setGetDateFormat() ) ), + ( s ? cIntMod + + f : ( IsType ? "HH:MM:SS" : hb_setGetTimeFormat() ) ), lDate, lTime ); - if( s ){ - if( !cIntMod[0] ){ + if( s ) + { + if( ! cIntMod[ 0 ] ) + { memcpy( cDTFrm, cDTFrm + 1, 26 ); /* LTrim 1 space if only Time */ - }else if( cDTFrm[s] == ' ' ){ - cDTFrm[s] = '\0'; /* RTrim 1 space if only Date */ + } + else if( cDTFrm[ s ] == ' ' ) + { + cDTFrm[ s ] = '\0'; /* RTrim 1 space if only Date */ } } - }else + } + else hb_dateFormat( hb_itemGetDS( pItmPar, cDTBuf ), cDTFrm, - (s ? cIntMod : (IsType ? "YYYY-MM-DD" : hb_setGetDateFormat())) ); + ( s ? cIntMod : ( IsType ? "YYYY-MM-DD" : hb_setGetDateFormat() ) ) ); /* 27 + 2 if %t and change format time */ - if( (f = i + HB_MAX(ulWidth, 29)) > ulMaxBuf ){ + if( ( f = i + HB_MAX( ulWidth, 29 ) ) > ulMaxBuf ) + { ulMaxBuf += f + DK_INCBUF; - cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf ); + cBuffer = ( char * ) hb_xrealloc( cBuffer, ulMaxBuf ); } pItmCpy = hb_itemNew( NULL ); hb_itemPutC( pItmCpy, cDTFrm ); - if( IsType ){ + if( IsType ) + { /* Empty DATE, DATETIME print DEFAULT for T converter or DK_EMPTYDATE, DK_EMPTYDATETIME for t converter */ - if( *cDTFrm == ' ' ) hb_itemPutC( pItmCpy, (HB_IS_TIMESTAMP( pItmPar ) ? - (IsType == 2 ? "DEFAULT" : DK_EMPTYDATETIME) : - (IsType == 2 ? "DEFAULT" : DK_EMPTYDATE)) ); - else STAItm( pItmCpy ); + if( *cDTFrm == ' ' ) + hb_itemPutC( pItmCpy, ( HB_IS_TIMESTAMP( pItmPar ) ? + ( IsType == 2 ? "DEFAULT" : DK_EMPTYDATETIME ) : + ( IsType == 2 ? "DEFAULT" : DK_EMPTYDATE ) ) ); + else + STAItm( pItmCpy ); } - s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmCpy ); + s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, + pItmCpy ); hb_itemRelease( pItmCpy ); - }else if( HB_IS_LOGICAL( pItmPar ) ){ + } + else if( HB_IS_LOGICAL( pItmPar ) ) + { - if( s ){ /* Internal Modifier */ - for( f = 0; cIntMod[f] && cIntMod[f] != ','; f++ ) {}; - if( f != s ) cIntMod[f++] = '\0'; /* TRUE & FALSE */ + if( s ) /* Internal Modifier */ + { + for( f = 0; cIntMod[ f ] && cIntMod[ f ] != ','; f++ ) + { + } + ; + if( f != s ) + cIntMod[ f++ ] = '\0'; /* TRUE & FALSE */ } - if( iCOut == 's' ){ + if( iCOut == 's' ) + { hb_itemCopy( pItmCpy = hb_itemNew( NULL ), pItmPar ); pItmPar = pItmCpy; - hb_itemPutC( pItmPar, (hb_itemGetL( pItmPar ) ? (s ? cIntMod : "TRUE") : (s ? cIntMod + f : "FALSE")) ); + hb_itemPutC( pItmPar, + ( hb_itemGetL( pItmPar ) ? ( s ? cIntMod : "TRUE" ) : ( s ? cIntMod + + f : + "FALSE" ) ) ); } - if( (f = i + (iCOut == 's' ? HB_MAX(ulWidth, (s ? s : 6)) : HB_MAX(ulWidth, DK_BLKBUF))) > ulMaxBuf ){ + if( ( f = i + + ( iCOut == + 's' ? HB_MAX( ulWidth, ( s ? s : 6 ) ) : HB_MAX( ulWidth, + DK_BLKBUF ) ) ) > + ulMaxBuf ) + { ulMaxBuf += f + DK_INCBUF; /* size of "FALSE" == 6 */ - cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf ); + cBuffer = ( char * ) hb_xrealloc( cBuffer, ulMaxBuf ); } - s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar ); - if( iCOut == 's' ) hb_itemRelease( pItmPar ); + s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, + pItmPar ); + if( iCOut == 's' ) + hb_itemRelease( pItmPar ); - }else if( iCOut == 's' ){ - char *cStr = hb_itemStr( pItmPar, NULL, NULL ); - const char *cTrimStr; + } + else if( iCOut == 's' ) + { + char * cStr = hb_itemStr( pItmPar, NULL, NULL ); + const char * cTrimStr; - if( cStr ){ + if( cStr ) + { HB_SIZE nLen = strlen( cStr ); cTrimStr = hb_strLTrim( cStr, &nLen ); f = ( HB_UINT ) nLen; - if( (f = i + HB_MAX(ulWidth, f)) > ulMaxBuf ){ + if( ( f = i + HB_MAX( ulWidth, f ) ) > ulMaxBuf ) + { ulMaxBuf += f + DK_INCBUF; - cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf ); + cBuffer = ( char * ) hb_xrealloc( cBuffer, ulMaxBuf ); } pItmCpy = hb_itemNew( NULL ); hb_itemPutCL( pItmCpy, cTrimStr, f ); - s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmCpy ); + s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, + pItmCpy ); hb_itemRelease( pItmCpy ); hb_xfree( cStr ); - }else{ + } + else + { iErrorPar = p + 2; break; } - }else if( HB_IS_NUMERIC( pItmPar ) || HB_IS_POINTER( pItmPar ) ){ - if( (f = i + HB_MAX(ulWidth, DK_BLKBUF)) > ulMaxBuf ){ + } + else if( HB_IS_NUMERIC( pItmPar ) || HB_IS_POINTER( pItmPar ) ) + { + if( ( f = i + HB_MAX( ulWidth, DK_BLKBUF ) ) > ulMaxBuf ) + { ulMaxBuf += f + DK_INCBUF; - cBuffer = (char *)hb_xrealloc( cBuffer, ulMaxBuf ); + cBuffer = ( char * ) hb_xrealloc( cBuffer, ulMaxBuf ); } - s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, pItmPar ); + s = SCItm( cBuffer, ulMaxBuf, cParFrm, iCOut, IsIndW, iIndWidth, IsIndP, iIndPrec, + pItmPar ); - }else{ + } + else + { iErrorPar = p + 2; break; } } - if( (f = s + ulResPos + sizeof(char)) > ulMaxRes ){ + if( ( f = s + ulResPos + sizeof( char ) ) > ulMaxRes ) + { ulMaxRes += f + DK_INCRES; - cRes = (char *)hb_xrealloc( cRes, ulMaxRes ); + cRes = ( char * ) hb_xrealloc( cRes, ulMaxRes ); } + hb_strncpy( cRes + ulResPos, cBuffer, s ); ulResPos += s; - if( (ulParPos = ( HB_UINT ) ( c - cItmFrm ) ) >= ulItmFrm ){ + if( ( ulParPos = ( HB_UINT ) ( c - cItmFrm ) ) >= ulItmFrm ) break; /* No more Par Format */ - } } - if( cIntMod ) hb_xfree( cIntMod ); - hb_xfree( cParFrm ); hb_xfree( cBuffer ); - if( iErrorPar ){ + + if( cIntMod ) + hb_xfree( cIntMod ); + + hb_xfree( cParFrm ); + hb_xfree( cBuffer ); + + if( iErrorPar ) + { hb_xfree( cRes ); - if( iErrorPar > 1 ){ - hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( iErrorPar ) ); - }else{ + + if( iErrorPar > 1 ) + hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( + 1 ), hb_paramError( iErrorPar ) ); + else hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) ); - } - }else{ - hb_retclen_buffer( cRes, ulResPos ); } + else + hb_retclen_buffer( cRes, ulResPos ); } } diff --git a/harbour/contrib/hbmisc/stringsx.c b/harbour/contrib/hbmisc/stringsx.c index ebb4b672e7..d39dd92414 100644 --- a/harbour/contrib/hbmisc/stringsx.c +++ b/harbour/contrib/hbmisc/stringsx.c @@ -4,104 +4,108 @@ #include "hbapi.h" -static const char *hb_strtoken(const char *szText, - HB_ISIZ nText, - HB_ISIZ nIndex, - char cDelimiter, - HB_ISIZ *pnLen) +static const char * hb_strtoken( const char * szText, + HB_ISIZ nText, + HB_ISIZ nIndex, + char cDelimiter, + HB_ISIZ * pnLen ) { - HB_ISIZ nStart; - HB_ISIZ nEnd = 0; - HB_ISIZ nCounter = 0; + HB_ISIZ nStart; + HB_ISIZ nEnd = 0; + HB_ISIZ nCounter = 0; - HB_TRACE(HB_TR_DEBUG, ("hb_strtoken(%s, %" HB_PFS "d, %" HB_PFS "d, %d, %p)", szText, nText, nIndex, (int) cDelimiter, pnLen)); + HB_TRACE( HB_TR_DEBUG, + ( "hb_strtoken(%s, %" HB_PFS "d, %" HB_PFS "d, %d, %p)", szText, nText, nIndex, + ( int ) cDelimiter, pnLen ) ); - do - { + do + { nStart = nEnd; if( cDelimiter != ' ' ) - { - if( szText[nStart] == cDelimiter ) + { + if( szText[ nStart ] == cDelimiter ) nStart++; - } + } else - { - while( nStart < nText && szText[nStart] == cDelimiter ) + { + while( nStart < nText && szText[ nStart ] == cDelimiter ) nStart++; - } + } - if( nStart < nText && szText[nStart] != cDelimiter ) - { - nEnd = nStart + 1; + if( nStart < nText && szText[ nStart ] != cDelimiter ) + { + nEnd = nStart + 1; - while( nEnd < nText && szText[nEnd] != cDelimiter ) + while( nEnd < nText && szText[ nEnd ] != cDelimiter ) nEnd++; - } + } else - nEnd = nStart; - } while( nCounter++ < nIndex - 1 && nEnd < nText ); + nEnd = nStart; + } + while( nCounter++ < nIndex - 1 && nEnd < nText ); - if( nCounter < nIndex ) - { + if( nCounter < nIndex ) + { *pnLen = 0; return ""; - } - else - { + } + else + { *pnLen = nEnd - nStart; return szText + nStart; - } + } } /* returns the nth occurence of a substring within a token-delimited string */ HB_FUNC( STRTOKEN ) { - const char *szText; - HB_ISIZ nIndex = hb_parns(2); - char cDelimiter = *hb_parc(3); - HB_ISIZ nLen; + const char * szText; + HB_ISIZ nIndex = hb_parns( 2 ); + char cDelimiter = *hb_parc( 3 ); + HB_ISIZ nLen; - if( !cDelimiter ) - cDelimiter = ' '; + if( ! cDelimiter ) + cDelimiter = ' '; - szText = hb_strtoken(hb_parc(1), hb_parclen(1), nIndex, cDelimiter, &nLen); + szText = hb_strtoken( hb_parc( 1 ), hb_parclen( 1 ), nIndex, cDelimiter, &nLen ); - hb_storns(nLen, 4); - hb_retclen(szText, nLen); + hb_storns( nLen, 4 ); + hb_retclen( szText, nLen ); } /* debug function to dump the ASCII values of an entire string */ HB_FUNC( STRDUMP ) { - const char *szText = hb_parc(1); - HB_ISIZ i, nLength = hb_parclen(1); - for( i = 0; i < nLength; i++ ) - printf("%d ", szText[i]); - printf("\n"); + const char * szText = hb_parc( 1 ); + HB_ISIZ i, nLength = hb_parclen( 1 ); + + for( i = 0; i < nLength; i++ ) + printf( "%d ", szText[ i ] ); + printf( "\n" ); } HB_FUNC( ROT13 ) { - if( HB_ISCHAR(1) ) - { - const char *szText = hb_parc( 1 ); - HB_SIZE i, nLen = hb_parclen( 1 ); - char *szResult = (char*)hb_xgrab(nLen + 1); + if( HB_ISCHAR( 1 ) ) + { + const char * szText = hb_parc( 1 ); + HB_SIZE i, nLen = hb_parclen( 1 ); + char * szResult = ( char * ) hb_xgrab( nLen + 1 ); for( i = 0; i < nLen; i++ ) - { - char c = szText[i]; - if( (c >= 'A' && c <= 'M') || (c >= 'a' && c <= 'm') ) + { + char c = szText[ i ]; + if( ( c >= 'A' && c <= 'M' ) || ( c >= 'a' && c <= 'm' ) ) c += 13; - else if( (c >= 'N' && c <= 'Z') || (c >= 'n' && c <= 'z') ) + else if( ( c >= 'N' && c <= 'Z' ) || ( c >= 'n' && c <= 'z' ) ) c -= 13; - szResult[i] = c; - } - hb_retclen(szResult, nLen); - hb_xfree(szResult); - } - else - hb_retc_null(); + szResult[ i ] = c; + } + hb_retclen( szResult, nLen ); + hb_xfree( szResult ); + } + else + hb_retc_null(); }