use configuration from GNU Taler for uncrustify

1 files changed, 77 insertions, 79 deletions

diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index a5b78fb7e..6ced05d7a 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -1,80 +1,78 @@
-# Almost the GNU format
-
-indent_with_tabs                = 0             # 1=indent to level only, 2=indent with tabs
-input_tab_size                  = 8             # original tab size
-output_tab_size                 = 8             # new tab size
-indent_columns                  = 2
-# indent_label                  = 2             # pos: absolute col, neg: relative column
-indent_align_string             = False         # align broken strings
-indent_brace                    = 2
-
-nl_enum_brace                   = remove        # "enum {" vs "enum \n {"
-nl_union_brace                  = remove        # "union {" vs "union \n {"
-nl_struct_brace                 = remove        # "struct {" vs "struct \n {"
-nl_do_brace                         = add               # "do {" vs "do \n {"
-nl_if_brace                         = add               # "if () {" vs "if () \n {"
-nl_for_brace                    = add           # "for () {" vs "for () \n {"
-nl_else_brace                   = add           # "else {" vs "else \n {"
-nl_while_brace                  = add           # "while () {" vs "while () \n {"
-nl_switch_brace                 = add           # "switch () {" vs "switch () \n {"
-nl_func_var_def_blk             = 1
-nl_before_case                  = 1
-nl_fcall_brace                  = add           # "foo() {" vs "foo()\n{"
-nl_fdef_brace                   = add           # "int foo() {" vs "int foo()\n{"
-# nl_after_return                       = TRUE
-nl_brace_while                  = add
-nl_brace_else                   = add
-nl_squeeze_ifdef                = TRUE
-
-# mod_paren_on_return           = ignore        # "return 1;" vs "return (1);"
-# mod_full_brace_if             = ignore        # "if (a) a--;" vs "if (a) { a--; }"
-# mod_full_brace_for            = ignore        # "for () a--;" vs "for () { a--; }"
-# mod_full_brace_do             = ignore        # "do a--; while ();" vs "do { a--; } while ();"
-# mod_full_brace_while          = ignore        # "while (a) a--;" vs "while (a) { a--; }"
-
-sp_before_semi                  = remove
-sp_paren_paren                  = remove        # space between (( and ))
-sp_return_paren                 = remove        # "return (1);" vs "return(1);"
-sp_sizeof_paren                 = remove        # "sizeof (int)" vs "sizeof(int)"
-sp_before_sparen                = force         # "if (" vs "if("
-sp_after_sparen                 = force         # "if () {" vs "if (){"
-sp_after_cast                   = remove        # "(int) a" vs "(int)a"
-sp_inside_braces                = force         # "{ 1 }" vs "{1}"
-sp_inside_braces_struct         = force         # "{ 1 }" vs "{1}"
-sp_inside_braces_enum           = force         # "{ 1 }" vs "{1}"
-sp_inside_paren                 = remove
-sp_inside_fparen                = remove
-sp_inside_sparen                = remove
-#sp_type_func                   = ignore
-sp_assign                       = force
-sp_arith                        = force
-sp_bool                         = force
-sp_compare                      = force
-sp_after_comma                  = force
-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();"
-
-# align_with_tabs                       = FALSE         # use tabs to align
-# align_on_tabstop              = FALSE         # align on tabstops
-# align_enum_equ_span           = 4
-# align_nl_cont                 = TRUE
-# align_var_def_span            = 2
-# align_var_def_inline          = TRUE
-# align_var_def_star            = TRUE
-# align_var_def_colon           = TRUE
-# align_assign_span             = 1
-# align_struct_init_span                = 3
-# align_var_struct_span         = 3
-# align_right_cmt_span          = 3
-# align_pp_define_span          = 3
-# align_pp_define_gap           = 4
-# align_number_right            = TRUE
-# align_typedef_span            = 5
-# align_typedef_gap             = 3
-
-# cmt_star_cont                 = TRUE
-
-eat_blanks_before_close_brace   = TRUE
-eat_blanks_after_open_brace     = TRUE
+input_tab_size = 2
+output_tab_size = 2
 
+indent_columns = 2
+indent_with_tabs = 0
+indent_case_brace = 2
+indent_label=0
+
+code_width=80
+#cmd_width=80
+
+# Leave most comments alone for now
+cmt_indent_multi=false
+sp_cmt_cpp_start=add
+
+sp_not=add
+
+sp_func_call_user_paren_paren=remove
+sp_inside_fparen=remove
+sp_after_cast=add
+
+ls_for_split_full=true
+ls_func_split_full=true
+ls_code_width=true
+
+# Arithmetic operations in wrapped expressions should be at the start
+# of the line.
+pos_arith=lead
+
+# Fully parenthesize boolean exprs
+mod_full_paren_if_bool=true
+
+# Braces should be on their own line
+nl_fdef_brace=add
+nl_enum_brace=add
+nl_struct_brace=add
+nl_union_brace=add
+nl_if_brace=add
+nl_brace_else=add
+nl_elseif_brace=add
+nl_while_brace=add
+nl_switch_brace=add
+
+# no newline between "else" and "if"
+nl_else_if=remove
+
+nl_func_paren=remove
+nl_assign_brace=remove
+
+# No extra newlines that cause noisy diffs
+nl_start_of_file=remove
+# If there's no new line, it's not a text file!
+nl_end_of_file=add
+
+sp_inside_paren = remove
+
+sp_arith = add
+sp_arith_additive = add
+
+# We want spaces before and after "="
+sp_before_assign = add
+sp_after_assign = add
+
+# we want "char *foo;"
+sp_after_ptr_star = remove
+sp_between_ptr_star = remove
+
+# we want "if (foo) { ... }"
+sp_before_sparen = add
+
+sp_inside_fparen = remove
+
+# add space before function call and decl: "foo (x)"
+sp_func_call_paren = add
+sp_func_proto_paren = add
+sp_func_proto_paren_empty = add
+sp_func_def_paren = add
+sp_func_def_paren_empty = add