ci: Update common files from meta-phosh

This updates to commit f3c92e90dcc0d65322888217429b75dd101bd0d3

.gitlab-ci/uncrustify.cfg

@@ -1,9 +1,22 @@
+#
+# Uncrustify config for phosh and related projects
+#
+
+# A span is the number of lines considered
+# A threshold is the maximum number of columns an item is moved
+
 # Indent by two spaces
 indent_columns                  = 2
 # No tabs
 indent_with_tabs                = 0
 # Line length
 code_width                      = 100
+# Whether to remove superfluous semicolons
+mod_remove_extra_semicolon      = true
+# indent goto by 1 (or -1 brace level)
+indent_label                    = -1
+# don't indent case after switch
+indent_switch_case              = 0
 
 #
 # Keywords and operators
@@ -30,11 +43,23 @@ nl_else_brace                   = remove
 nl_else_if                      = remove
 # Add or remove newline between 'for' and '{'.
 nl_for_brace                    = remove
+# Add or remove newline between 'while' and '{'.
+nl_while_brace                  = remove
 # Treat iterators as for loops:
 set FOR wl_list_for_each wl_list_for_each_reverse wl_list_for_each_safe
+# Remove braces on single line if/for/while statements
+mod_full_brace_if               = remove
+mod_full_brace_for              = remove
+mod_full_brace_while            = remove
+# If any must be braced, they are all braced.  If all can be unbraced, then the braces are removed.
+mod_full_brace_if_chain         = 1
+# Remove braces around case (when there are no variables declarations)
+mod_case_brace                  = remove
+# Don't remove branches if the statement has more than one line
+mod_full_brace_nl               = 2
 
 #
-# Function declarations, defintions and calls
+# Function declarations, definitions and calls
 #
 # Add space between function name and '(' on function declaration.
 sp_func_proto_paren             = add
@@ -45,6 +70,10 @@ sp_func_proto_paren_empty       = add
 sp_func_def_paren               = add
 # Add or remove space between function name and '(' on function calls.
 sp_func_call_paren              = add
+# Specialcase i18n macros
+set func_call_user               _ N_ C_
+sp_func_call_user_paren         = remove
+
 # Whether to force indentation of function definitions to start in column 1.
 indent_func_def_force_col1      = true
 # Add newline between return type and function name in a function definition.
@@ -102,8 +131,15 @@ align_typedef_star_style        = 2
 # The gap for aligning struct/union member definitions.
 align_var_struct_gap            = 1
 # The span for aligning struct/union member definitions.
-align_var_struct_span           = 8
+align_var_struct_span           = 4
+# The threshold for aligning struct/union member definitions.
+align_var_struct_thresh         = 8
+
 # Remove space between pointer stars '*'.
 sp_between_ptr_star             = remove
 # Add space before '(' of control statements ('if', 'for', 'switch', 'while', etc.)
 sp_before_sparen                = add
+
+# Add spaces around assignments and arithmethic operators
+sp_assign = add
+sp_arith = add