From d967eaf94dec4586b6e1df80bc71b115ea8eca8f Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Tue, 25 Mar 2014 22:32:52 +0400 Subject: [PATCH] Uncrustify config --- libuavcan/uncrustify.cfg | 18 +++++++++--------- libuavcan/uncrustify.sh | 5 +++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libuavcan/uncrustify.cfg b/libuavcan/uncrustify.cfg index ecf653d8b9..19204cd38b 100644 --- a/libuavcan/uncrustify.cfg +++ b/libuavcan/uncrustify.cfg @@ -271,7 +271,7 @@ sp_before_pp_stringify = ignore # ignore/add/remove/force sp_bool = add # ignore/add/remove/force # Add or remove space around compare operator '<', '>', '==', etc -sp_compare = add # ignore/add/remove/force +sp_compare = ignore # ignore/add/remove/force # Add or remove space inside '(' and ')' sp_inside_paren = remove # ignore/add/remove/force @@ -283,7 +283,7 @@ sp_paren_paren = remove # ignore/add/remove/force sp_balance_nested_parens = false # false/true # Add or remove space between ')' and '{' -sp_paren_brace = add # ignore/add/remove/force +sp_paren_brace = ignore # ignore/add/remove/force # Add or remove space before pointer star '*' sp_before_ptr_star = ignore # ignore/add/remove/force @@ -296,10 +296,10 @@ sp_before_unnamed_ptr_star = ignore # ignore/add/remove/force sp_between_ptr_star = remove # ignore/add/remove/force # Add or remove space after pointer star '*', if followed by a word. -sp_after_ptr_star = add # ignore/add/remove/force +sp_after_ptr_star = ignore # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by a func proto/def. -sp_after_ptr_star_func = add # ignore/add/remove/force +sp_after_ptr_star_func = ignore # ignore/add/remove/force # Add or remove space after a pointer star '*', if followed by an open paren (function types). sp_ptr_star_paren = ignore # ignore/add/remove/force @@ -356,7 +356,7 @@ sp_angle_shift = ignore # ignore/add/remove/force sp_permit_cpp11_shift = false # false/true # Add or remove space before '(' of 'if', 'for', 'switch', and 'while' -sp_before_sparen = add # ignore/add/remove/force +sp_before_sparen = ignore # ignore/add/remove/force # Add or remove space inside if-condition '(' and ')' sp_inside_sparen = ignore # ignore/add/remove/force @@ -410,10 +410,10 @@ sp_before_squares = ignore # ignore/add/remove/force sp_inside_square = ignore # ignore/add/remove/force # Add or remove space after ',' -sp_after_comma = add # ignore/add/remove/force +sp_after_comma = ignore # ignore/add/remove/force # Add or remove space before ',' -sp_before_comma = remove # ignore/add/remove/force +sp_before_comma = ignore # ignore/add/remove/force # Add or remove space between an open paren and comma: '(,' vs '( ,' sp_paren_comma = force # ignore/add/remove/force @@ -480,7 +480,7 @@ sp_inside_fparens = remove # ignore/add/remove/force sp_inside_fparen = ignore # ignore/add/remove/force # Add or remove space inside the first parens in the function type: 'void (*x)(...)' -sp_inside_tparen = remove # ignore/add/remove/force +sp_inside_tparen = ignore # ignore/add/remove/force # Add or remove between the parens in the function type: 'void (*x)(...)' sp_after_tparen_close = ignore # ignore/add/remove/force @@ -595,7 +595,7 @@ sp_deref = remove # ignore/add/remove/force sp_sign = remove # ignore/add/remove/force # Add or remove space before or after '++' and '--', as in '(--x)' or 'y++;'. Default=Remove -sp_incdec = remove # ignore/add/remove/force +sp_incdec = ignore # ignore/add/remove/force # Add or remove space before a backslash-newline at the end of a line. Default=Add sp_before_nl_cont = add # ignore/add/remove/force diff --git a/libuavcan/uncrustify.sh b/libuavcan/uncrustify.sh index 52f19375c6..2ef3e3e1fe 100755 --- a/libuavcan/uncrustify.sh +++ b/libuavcan/uncrustify.sh @@ -1,6 +1,7 @@ #!/bin/sh -files="$files $(find include -name '*.hpp')" -files="$files $(find src -name '*.cpp')" +#files="$files $(find include -name '*.hpp')" +#files="$files $(find src -name '*.cpp')" +#files="$files $(find test -name '*.cpp')" uncrustify --replace --no-backup -c uncrustify.cfg $files