summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-10-31 10:19:37 +0100
committerChristian Grothoff <christian@grothoff.org>2019-10-31 13:01:55 +0100
commitb94c69aeb88d446415e8f12b6e5454d027176b0d (patch)
tree83801b4953b91215de3881ef55bf1593de292f71 /contrib
parent6edff51bf6044779a42bac7b964a08d44b45fe0b (diff)
downloadmerchant-b94c69aeb88d446415e8f12b6e5454d027176b0d.tar.gz
merchant-b94c69aeb88d446415e8f12b6e5454d027176b0d.tar.bz2
merchant-b94c69aeb88d446415e8f12b6e5454d027176b0d.zip
tighten formatting rules
Diffstat (limited to 'contrib')
-rw-r--r--contrib/uncrustify.cfg17
1 files changed, 17 insertions, 0 deletions
diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index f56c8e73..8c9df2c4 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -49,8 +49,12 @@ 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
@@ -69,6 +73,7 @@ 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
@@ -76,3 +81,15 @@ 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