From e6fc3d8f17a09e17a06631cef4283e7e15986758 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 30 Apr 2018 11:48:23 -0700 Subject: [PATCH] tweaks to the style - tried to improve struct variable alignment - ignore braces on function definitions so we can keep the existing BIND style; braces can be on a new line or not --- .uncrustify.cfg | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.uncrustify.cfg b/.uncrustify.cfg index e030106ef1..485735f3bd 100644 --- a/.uncrustify.cfg +++ b/.uncrustify.cfg @@ -170,7 +170,7 @@ indent_col1_comment = false # false/true # How to indent goto labels # >0 : absolute column where 1 is the leftmost column # <=0 : subtract from brace indent -indent_label = 1 # number +indent_label = 2 # number # Same as indent_label, but for access specifiers that are followed by a colon indent_access_spec = 1 # number @@ -658,7 +658,7 @@ align_var_def_span = 0 # number # 0=Part of the type 'void * foo;' # 1=Part of the variable 'void *foo;' # 2=Dangling 'void *foo;' -align_var_def_star_style = 1 # number +align_var_def_star_style = 0 # number # How to align the '&' in variable definitions. # 0=Part of the type @@ -694,13 +694,13 @@ align_enum_equ_span = 0 # number align_enum_equ_thresh = 0 # number # The span for aligning struct/union (0=don't align) -align_var_struct_span = 1 # number +align_var_struct_span = 3 # number # The threshold for aligning struct/union member definitions (0=no limit) align_var_struct_thresh = 0 # number # The gap for aligning struct/union member definitions -align_var_struct_gap = 0 # number +align_var_struct_gap = 8 # number # The span for aligning struct initializer values (0=don't align) align_struct_init_span = 0 # number @@ -715,7 +715,7 @@ align_typedef_span = 0 # number # 0: Don't mix them at all # 1: align the open paren with the types # 2: align the function type name with the other type names -align_typedef_func = 0 # number +align_typedef_func = 2 # number # Controls the positioning of the '*' in typedefs. Just try it. # 0: Align on typedef type, ignore '*' @@ -994,7 +994,7 @@ nl_func_decl_empty = ignore # ignore/add/remove/force nl_func_def_empty = ignore # ignore/add/remove/force # Add or remove newline between function signature and '{' -nl_fdef_brace = add # ignore/add/remove/force +nl_fdef_brace = ignore # ignore/add/remove/force # Whether to put a newline after 'return' statement nl_after_return = false # false/true