a small syntax cleanup made with uncrustify

svn path=/trunk/; revision=955

1 files changed, 49 insertions, 3 deletions

diff --git a/tools/cheese-indent.cfg b/tools/cheese-indent.cfg
index 712b498..aab86ee 100644
--- a/tools/cheese-indent.cfg
+++ b/tools/cheese-indent.cfg
@@ -155,13 +155,13 @@ sp_before_semi_for_empty = force    # ignore/add/remove/force
 #  0=Part of the type
 #  1=Part of the variable
 #  2=Dangling
-align_var_def_star_style = 1        # number
+align_var_def_star_style = 2        # number
 
 # How to align the '&' in variable definitions.
 #  0=Part of the type
 #  1=Part of the variable
 #  2=Dangling
-align_var_def_amp_style = 1        # number
+align_var_def_amp_style = 2        # number
 
 # Align variable definitions in prototypes and functions
 align_func_params = true     # false/true
@@ -178,6 +178,46 @@ align_func_proto_span = 1        # number
 # The span for aligning on '#define' bodies (0=don't align)
 align_pp_define_span = 1        # number
 
+# Controls the positioning of the '*' in typedefs. Just try it.
+# 0: Align on typdef type, ignore '*'
+# 1: The '*' is part of type name: typedef int  *pint;
+# 2: The '*' is part of the type, but dangling: typedef int *pint;
+align_typedef_star_style = 2        # number
+
+# Controls the positioning of the '&' in typedefs. Just try it.
+# 0: Align on typdef type, ignore '&'
+# 1: The '&' is part of type name: typedef int  &pint;
+# 2: The '&' is part of the type, but dangling: typedef int &pint;
+align_typedef_amp_style = 2        # number
+
+# Whether to align macros wrapped with a backslash and a newline.
+# This will not work right if the macro contains a multi-line comment.
+align_nl_cont = true    # false/true
+
+# The span for aligning struct/union (0=don't align)
+align_var_struct_span                    = 1        # number
+
+# The threshold for aligning struct/union member definitions (0=no limit)
+align_var_struct_thresh                  = 1        # number
+
+# The gap for aligning struct/union member definitions
+align_var_struct_gap                     = 1        # number
+
+# The span for aligning struct initializer values (0=don't align)
+align_struct_init_span                   = 1        # number
+
+# The gap for aligning variable definitions
+align_var_def_gap                        = 1        # number
+
+# The span for aligning on '=' in assignments (0=don't align)
+align_assign_span                        = 1        # number
+
+# The span for aligning on '=' in enums (0=don't align)
+align_enum_equ_span                      = 1        # number
+
+# The span for aligning variable definitions (0=don't align)
+align_var_def_span                       = 1        # number
+
 # Add or remove newline at the end of the file
 nl_end_of_file = force   # ignore/add/remove/force
 
@@ -214,7 +254,7 @@ nl_elseif_brace = force   # ignore/add/remove/force
 nl_else_brace = force   # ignore/add/remove/force
 
 # Add or remove newline between 'else' and 'if'
-nl_else_if = force   # ignore/add/remove/force
+nl_else_if = remove   # ignore/add/remove/force
 
 # Add or remove newline between 'for' and '{'
 nl_for_brace = force   # ignore/add/remove/force
@@ -276,6 +316,9 @@ nl_before_cpp_comment = 2        # number
 # Don't touch one-line braced assignments - 'foo_t f = { 1, 2 };'
 nl_assign_leave_one_liners = true     # false/true
 
+# Whether to not put blanks after '#ifxx', '#elxx', or before '#endif'
+nl_squeeze_ifdef = true    # false/true
+
 # Whether to remove blank lines after '{'
 eat_blanks_after_open_brace = true    # false/true
 
@@ -291,6 +334,9 @@ cmt_c_group = true    # false/true
 # Whether to group cpp-comments that look like they are in a block
 cmt_cpp_group = false    # false/true
 
+# Whether to change cpp-comments into c-comments
+cmt_cpp_to_c = true    # false/true
+
 # If pp_indent_at_level=false, specifies the number of columns to indent per
 # level. Default=1.
 pp_indent_count = indent_columns        # number