aboutsummaryrefslogtreecommitdiff
path: root/contrib/conf
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2021-12-20 10:59:42 +0100
committerMartin Schanzenbach <schanzen@gnunet.org>2021-12-20 10:59:42 +0100
commited65e2cac3e720c226f8dec07ac37ab62578724e (patch)
tree67ff1ec66a29423cb173d6a07defcb4ad8e4baa6 /contrib/conf
parent511058f7e97d46eebe74a8c14aaff81865faa860 (diff)
downloadgnunet-ed65e2cac3e720c226f8dec07ac37ab62578724e.tar.gz
gnunet-ed65e2cac3e720c226f8dec07ac37ab62578724e.zip
BUILD: Kill build-common
Diffstat (limited to 'contrib/conf')
-rw-r--r--contrib/conf/uncrustify.cfg19
-rwxr-xr-xcontrib/conf/uncrustify_precommit2
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
4indent_columns = 2 4indent_columns = 2
5indent_with_tabs = 0 5indent_with_tabs = 0
6indent_case_brace = 2 6indent_case_brace = 2
7indent_label=-16 7indent_label=0
8 8
9code_width=80 9code_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
51nl_start_of_file=remove 51nl_start_of_file=remove
52nl_after_func_proto = 2
53nl_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!
55nl_end_of_file=add 53nl_end_of_file=add
56nl_max_blank_in_func = 3
57nl_max = 3
58 54
59sp_inside_paren = remove 55sp_inside_paren = remove
60 56
@@ -73,7 +69,6 @@ sp_between_ptr_star = remove
73sp_before_sparen = add 69sp_before_sparen = add
74 70
75sp_inside_fparen = remove 71sp_inside_fparen = remove
76sp_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)"
79sp_func_call_paren = add 74sp_func_call_paren = add
@@ -81,15 +76,3 @@ sp_func_proto_paren = add
81sp_func_proto_paren_empty = add 76sp_func_proto_paren_empty = add
82sp_func_def_paren = add 77sp_func_def_paren = add
83sp_func_def_paren_empty = add 78sp_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
87sp_paren_paren = ignore
88sp_inside_paren = remove
89sp_bool = force
90
91nl_func_type_name = force
92#nl_branch_else = add
93nl_else_brace = add
94nl_elseif_brace = add
95nl_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 ];
30then 30then
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."
34fi 34fi
35exit $RET 35exit $RET