diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2021-12-20 10:59:42 +0100 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2021-12-20 10:59:42 +0100 |
commit | ed65e2cac3e720c226f8dec07ac37ab62578724e (patch) | |
tree | 67ff1ec66a29423cb173d6a07defcb4ad8e4baa6 /contrib/conf | |
parent | 511058f7e97d46eebe74a8c14aaff81865faa860 (diff) | |
download | gnunet-ed65e2cac3e720c226f8dec07ac37ab62578724e.tar.gz gnunet-ed65e2cac3e720c226f8dec07ac37ab62578724e.zip |
BUILD: Kill build-common
Diffstat (limited to 'contrib/conf')
-rw-r--r-- | contrib/conf/uncrustify.cfg | 19 | ||||
-rwxr-xr-x | contrib/conf/uncrustify_precommit | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/contrib/conf/uncrustify.cfg b/contrib/conf/uncrustify.cfg index 8c9df2c43..6ced05d7a 100644 --- a/contrib/conf/uncrustify.cfg +++ b/contrib/conf/uncrustify.cfg | |||
@@ -4,7 +4,7 @@ output_tab_size = 2 | |||
4 | indent_columns = 2 | 4 | indent_columns = 2 |
5 | indent_with_tabs = 0 | 5 | indent_with_tabs = 0 |
6 | indent_case_brace = 2 | 6 | indent_case_brace = 2 |
7 | indent_label=-16 | 7 | indent_label=0 |
8 | 8 | ||
9 | code_width=80 | 9 | code_width=80 |
10 | #cmd_width=80 | 10 | #cmd_width=80 |
@@ -49,12 +49,8 @@ nl_assign_brace=remove | |||
49 | 49 | ||
50 | # No extra newlines that cause noisy diffs | 50 | # No extra newlines that cause noisy diffs |
51 | nl_start_of_file=remove | 51 | nl_start_of_file=remove |
52 | nl_after_func_proto = 2 | ||
53 | nl_after_func_body = 3 | ||
54 | # If there's no new line, it's not a text file! | 52 | # If there's no new line, it's not a text file! |
55 | nl_end_of_file=add | 53 | nl_end_of_file=add |
56 | nl_max_blank_in_func = 3 | ||
57 | nl_max = 3 | ||
58 | 54 | ||
59 | sp_inside_paren = remove | 55 | sp_inside_paren = remove |
60 | 56 | ||
@@ -73,7 +69,6 @@ sp_between_ptr_star = remove | |||
73 | sp_before_sparen = add | 69 | sp_before_sparen = add |
74 | 70 | ||
75 | sp_inside_fparen = remove | 71 | sp_inside_fparen = remove |
76 | sp_inside_sparen = remove | ||
77 | 72 | ||
78 | # add space before function call and decl: "foo (x)" | 73 | # add space before function call and decl: "foo (x)" |
79 | sp_func_call_paren = add | 74 | sp_func_call_paren = add |
@@ -81,15 +76,3 @@ sp_func_proto_paren = add | |||
81 | sp_func_proto_paren_empty = add | 76 | sp_func_proto_paren_empty = add |
82 | sp_func_def_paren = add | 77 | sp_func_def_paren = add |
83 | sp_func_def_paren_empty = add | 78 | sp_func_def_paren_empty = add |
84 | |||
85 | # We'd want it for "if ( (foo) || (bar) )", but not for "if (m())", | ||
86 | # so as uncrustify doesn't give exactly what we want => ignore | ||
87 | sp_paren_paren = ignore | ||
88 | sp_inside_paren = remove | ||
89 | sp_bool = force | ||
90 | |||
91 | nl_func_type_name = force | ||
92 | #nl_branch_else = add | ||
93 | nl_else_brace = add | ||
94 | nl_elseif_brace = add | ||
95 | nl_for_brace = add | ||
diff --git a/contrib/conf/uncrustify_precommit b/contrib/conf/uncrustify_precommit index 24873330f..fd29998c3 100755 --- a/contrib/conf/uncrustify_precommit +++ b/contrib/conf/uncrustify_precommit | |||
@@ -30,6 +30,6 @@ if [ $RET = 1 ]; | |||
30 | then | 30 | then |
31 | echo "Run" | 31 | echo "Run" |
32 | echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}" | 32 | echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}" |
33 | echo "before committing." | 33 | echo "before commiting." |
34 | fi | 34 | fi |
35 | exit $RET | 35 | exit $RET |