scripts: Update uncrustify config

It looks like I forgot to merge the latest uncrustify config last
time I did an uncrustify run.

This commit puts it in place.

diff --git a/scripts/default.cfg b/scripts/default.cfg
index 78df1718780d691d8b8a4655e889ffe52daf58d8..d4256748371a8e6cb4ca2f537f4c13a45f21119f 100644 (file)
--- a/scripts/default.cfg
+++ b/scripts/default.cfg
@@ -24,7 +24,7 @@ nl_brace_else = remove # "} else" vs "} \n else" - cuddle else
 sp_brace_else = force
 sp_else_brace = force
 nl_func_def_args = add
-nl_func_var_def_blk = 1
+nl_func_var_def_blk = 0
 nl_fcall_brace = remove # "list_for_each() {" vs "list_for_each()\n{"
 nl_fdef_brace = add # "int foo() {" vs "int foo()\n{"
 # nl_after_return = TRUE;
@@ -36,8 +36,8 @@ nl_fdef_brace = add # "int foo() {" vs "int foo()\n{"
 #
 
 mod_paren_on_return = remove # "return 1;" vs "return (1);"
-mod_full_brace_if = add # "if (a) a--;" vs "if (a) { a--; }"
-mod_full_brace_if_chain = true
+mod_full_brace_if = ignore # "if (a) a--;" vs "if (a) { a--; }"
+mod_full_brace_if_chain = 3
 mod_full_brace_for = force # "for () a--;" vs "for () { a--; }"
 mod_full_brace_do = force # "do a--; while ();" vs "do { a--; } while ();"
 mod_full_brace_while = force # "while (a) a--;" vs "while (a) { a--; }"