summaryrefslogtreecommitdiff
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)
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
indent_columns = 2
indent_with_tabs = 0
indent_case_brace = 2
-indent_label=-16
+indent_label=0
code_width=80
#cmd_width=80
@@ -49,12 +49,8 @@ nl_assign_brace=remove
# No extra newlines that cause noisy diffs
nl_start_of_file=remove
-nl_after_func_proto = 2
-nl_after_func_body = 3
# If there's no new line, it's not a text file!
nl_end_of_file=add
-nl_max_blank_in_func = 3
-nl_max = 3
sp_inside_paren = remove
@@ -73,7 +69,6 @@ sp_between_ptr_star = remove
sp_before_sparen = add
sp_inside_fparen = remove
-sp_inside_sparen = remove
# add space before function call and decl: "foo (x)"
sp_func_call_paren = add
@@ -81,15 +76,3 @@ sp_func_proto_paren = add
sp_func_proto_paren_empty = add
sp_func_def_paren = add
sp_func_def_paren_empty = add
-
-# We'd want it for "if ( (foo) || (bar) )", but not for "if (m())",
-# so as uncrustify doesn't give exactly what we want => ignore
-sp_paren_paren = ignore
-sp_inside_paren = remove
-sp_bool = force
-
-nl_func_type_name = force
-#nl_branch_else = add
-nl_else_brace = add
-nl_elseif_brace = add
-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 ];
then
echo "Run"
echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}"
- echo "before committing."
+ echo "before commiting."
fi
exit $RET