uncrustify UPDATE use version 0.77.1

.github/workflows/ci.yml

@@ -114,7 +114,7 @@ jobs:
         shell: bash
         working-directory: ${{ github.workspace }}
         run: |
-          git clone --branch uncrustify-0.75.0 https://github.com/uncrustify/uncrustify
+          git clone --branch uncrustify-0.77.1 https://github.com/uncrustify/uncrustify
           cd uncrustify
           mkdir build
           cd build

CMakeLists.txt

@@ -199,7 +199,7 @@ if(ENABLE_COVERAGE)
 endif()
 
 if ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG")
-    source_format_enable(0.76)
+    source_format_enable(0.77)
 endif()
 
 #

cli/commands.c

@@ -6696,10 +6696,14 @@ COMMAND commands[] = {
     {"edit-config", cmd_editconfig, cmd_editconfig_help, "ietf-netconf <edit-config> operation"},
     {"edit-data", cmd_editdata, cmd_editdata_help, "ietf-netconf-nmda <edit-data> operation"},
     {"editor", cmd_editor, cmd_editor_help, "Set the text editor for working with XML data"},
-    {"establish-push", cmd_establishpush, cmd_establishpush_help,
-        "ietf-subscribed-notifications <establish-subscription> operation with ietf-yang-push augments"},
-    {"establish-sub", cmd_establishsub, cmd_establishsub_help,
-        "ietf-subscribed-notifications <establish-subscription> operation"},
+    {
+        "establish-push", cmd_establishpush, cmd_establishpush_help,
+        "ietf-subscribed-notifications <establish-subscription> operation with ietf-yang-push augments"
+    },
+    {
+        "establish-sub", cmd_establishsub, cmd_establishsub_help,
+        "ietf-subscribed-notifications <establish-subscription> operation"
+    },
     {"exit", cmd_quit, NULL, "Quit the program"},
     {"get", cmd_get, cmd_get_help, "ietf-netconf <get> operation"},
     {"get-config", cmd_getconfig, cmd_getconfig_help, "ietf-netconf <get-config> operation"},
@@ -6713,16 +6717,20 @@ COMMAND commands[] = {
 #endif
     {"listen", cmd_listen, cmd_listen_help, "Wait for a Call Home connection from a NETCONF server"},
     {"lock", cmd_lock, cmd_lock_help, "ietf-netconf <lock> operation"},
-    {"modify-push", cmd_modifypush, cmd_modifypush_help,
-        "ietf-subscribed-notifications <modify-subscription> operation with ietf-yang-push augments"},
+    {
+        "modify-push", cmd_modifypush, cmd_modifypush_help,
+        "ietf-subscribed-notifications <modify-subscription> operation with ietf-yang-push augments"
+    },
     {"modify-sub", cmd_modifysub, cmd_modifysub_help, "ietf-subscribed-notifications <modify-subscription> operation"},
     {"outputformat", cmd_outputformat, cmd_outputformat_help, "Set the output format of all the data"},
     {"resync-sub", cmd_resyncsub, cmd_resyncsub_help, "ietf-yang-push <resync-subscription> operation"},
     {"searchpath", cmd_searchpath, cmd_searchpath_help, "Set the search path for models"},
     {"status", cmd_status, NULL, "Display information about the current NETCONF session"},
     {"subscribe", cmd_subscribe, cmd_subscribe_help, "notifications <create-subscription> operation"},
-    {"timed", cmd_timed, cmd_timed_help, "Time all the commands (that communicate with a server) from issuing an RPC"
-        " to getting a reply"},
+    {
+        "timed", cmd_timed, cmd_timed_help, "Time all the commands (that communicate with a server) from issuing an RPC"
+        " to getting a reply"
+    },
     {"unlock", cmd_unlock, cmd_unlock_help, "ietf-netconf <unlock> operation"},
     {"user-rpc", cmd_userrpc, cmd_userrpc_help, "Send your own content in an RPC envelope"},
     {"validate", cmd_validate, cmd_validate_help, "ietf-netconf <validate> operation"},

uncrustify.cfg

@@ -1,4 +1,4 @@
-# Uncrustify-0.76.0_f
+# Uncrustify-0.77.1_f
 
 #
 # General options
@@ -210,6 +210,11 @@ sp_before_ptr_star              = force    # ignore/add/remove/force
 # variable name. If set to ignore, sp_before_ptr_star is used instead.
 sp_before_unnamed_ptr_star      = ignore   # ignore/add/remove/force
 
+# Add or remove space between a qualifier and a pointer star '*' that isn't
+# followed by a variable name, as in '(char const *)'. If set to ignore,
+# sp_before_ptr_star is used instead.
+sp_qualifier_unnamed_ptr_star   = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space between pointer stars '*'.
 sp_between_ptr_star             = remove   # ignore/add/remove/force
 
@@ -250,10 +255,20 @@ sp_ptr_star_paren               = remove   # ignore/add/remove/force
 # prototype or function definition.
 sp_before_ptr_star_func         = force    # ignore/add/remove/force
 
+# Add or remove space between a qualifier and a pointer star '*' followed by
+# the name of the function in a function prototype or definition, as in
+# 'char const *foo()`. If set to ignore, sp_before_ptr_star is used instead.
+sp_qualifier_ptr_star_func      = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a pointer star '*' in the trailing return of a
 # function prototype or function definition.
 sp_before_ptr_star_trailing     = ignore   # ignore/add/remove/force/not_defined
 
+# Add or remove space between a qualifier and a pointer star '*' in the
+# trailing return of a function prototype or function definition, as in
+# 'auto foo() -> char const *'.
+sp_qualifier_ptr_star_trailing  = force   # ignore/add/remove/force/not_defined
+
 # Add or remove space before a reference sign '&'.
 sp_before_byref                 = ignore    # ignore/add/remove/force
 
@@ -611,6 +626,16 @@ sp_inside_fparens               = remove   # ignore/add/remove/force
 # Add or remove space inside function '(' and ')'.
 sp_inside_fparen                = remove   # ignore/add/remove/force
 
+# Add or remove space inside user functor '(' and ')'.
+sp_func_call_user_inside_rparen = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside empty functor '()'.
+# Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
+sp_inside_rparens               = ignore   # ignore/add/remove/force/not_defined
+
+# Add or remove space inside functor '(' and ')'.
+sp_inside_rparen                = ignore   # ignore/add/remove/force/not_defined
+
 # Add or remove space inside the first parentheses in a function type, as in
 # 'void (*x)(...)'.
 sp_inside_tparen                = remove   # ignore/add/remove/force
@@ -951,6 +976,14 @@ sp_extern_paren                 = ignore   # ignore/add/remove/force
 # i.e. '// A' vs. '//A'.
 sp_cmt_cpp_start                = force    # ignore/add/remove/force
 
+# remove space after the '//' and the pvs command '-V1234',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_pvs                  = false    # true/false
+
+# remove space after the '//' and the command 'lint',
+# only works with sp_cmt_cpp_start set to add or force.
+sp_cmt_cpp_lint                 = false    # true/false
+
 # Add or remove space in a C++ region marker comment, as in '// <here> BEGIN'.
 # A region marker is defined as a comment which is not preceded by other text
 # (i.e. the comment is the first non-whitespace on the line), and which starts
@@ -2804,9 +2837,19 @@ align_single_line_brace_gap     = 1        # unsigned number
 # 0: Don't align (default).
 align_oc_msg_spec_span          = 0        # unsigned 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                   = false    # true/false
+# 0: Do nothing (default)
+# 1: Align the backslashes in the column at the end of the longest line
+# 2: Align with the backslash that is farthest to the left, or, if that
+#    backslash is farther left than the end of the longest line, at the end of
+#    the longest line
+# 3: Align with the backslash that is farthest to the right
+align_nl_cont                   = 0        # unsigned number
+
+# The minimum number of spaces between the end of a line and its continuation
+# backslash. Requires align_nl_cont.
+#
+# Default: 1
+align_nl_cont_spaces            = 1        # unsigned number
 
 # Whether to align macro functions and variables together.
 align_pp_define_together        = false    # true/false
@@ -3117,6 +3160,12 @@ mod_remove_extra_semicolon      = true     # true/false
 # Whether to remove duplicate include.
 mod_remove_duplicate_include    = true    # true/false
 
+# the following options (mod_XX_closebrace_comment) use different comment,
+# depending of the setting of the next option.
+# false: Use the c comment (default)
+# true : Use the cpp comment
+mod_add_force_c_closebrace_comment = false    # true/false
+
 # If a function body exceeds the specified number of newlines and doesn't have
 # a comment after the close brace, a comment will be added.
 mod_add_long_function_closebrace_comment = 0        # unsigned number