From e52741679e9dfe0cb5f2ae4b60c9fd88b52da0b1 Mon Sep 17 00:00:00 2001 From: Niclas Antti Date: Thu, 1 Nov 2018 13:43:34 +0200 Subject: [PATCH] Change uncrustify to add newline before constructor initializer list. Also add exclusion of "build" directory to maxscale-uncrustify.sh script. --- script/maxscale-uncrustify.sh | 2 +- uncrustify.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/maxscale-uncrustify.sh b/script/maxscale-uncrustify.sh index d5a48d41a..2836b4070 100755 --- a/script/maxscale-uncrustify.sh +++ b/script/maxscale-uncrustify.sh @@ -2,5 +2,5 @@ currdir=$(dirname $(realpath $0)) -$currdir/list-src -x 'sqlite-src-3110100 pcre2' $currdir/..|xargs uncrustify -c $currdir/../uncrustify.cfg --no-backup --mtime +$currdir/list-src -x 'sqlite-src-3110100 pcre2 build' $currdir/.. | xargs uncrustify -c $currdir/../uncrustify.cfg --no-backup --mtime diff --git a/uncrustify.cfg b/uncrustify.cfg index b92f76baa..ff1da8148 100644 --- a/uncrustify.cfg +++ b/uncrustify.cfg @@ -1274,7 +1274,7 @@ nl_class_colon = ignore # ignore/add/remove/force # Add or remove a newline around a class constructor colon. # Related to nl_constr_init_args, pos_constr_colon and pos_constr_comma. -nl_constr_colon = ignore # ignore/add/remove/force +nl_constr_colon = add # ignore/add/remove/force # If true turns two liner namespace to one liner,else will make then four liners #0.67 nl_namespace_two_to_one_liner = false # false/true