diff --git a/.clang-format b/.clang-format index 110ff05f23..4099440415 100644 --- a/.clang-format +++ b/.clang-format @@ -65,9 +65,9 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: false -ForEachMacros: ['c_list_for_each', - 'c_list_for_each_prev', - 'c_list_for_each_prev_safe', +ForEachMacros: [ + 'FOR_EACH_DELAYED_ACTION', + 'c_list_for_each', 'c_list_for_each_continue', 'c_list_for_each_entry', 'c_list_for_each_entry_continue', @@ -75,6 +75,8 @@ ForEachMacros: ['c_list_for_each', 'c_list_for_each_entry_safe', 'c_list_for_each_entry_safe_continue', 'c_list_for_each_entry_safe_unlink', + 'c_list_for_each_prev', + 'c_list_for_each_prev_safe', 'c_list_for_each_safe', 'c_list_for_each_safe_continue', 'c_list_for_each_safe_unlink', @@ -105,12 +107,12 @@ ForEachMacros: ['c_list_for_each', 'nm_ip_config_iter_ip_route_for_each', 'nm_json_array_foreach', 'nm_json_object_foreach', - 'nm_l3_config_data_iter_ip_address_for_each', 'nm_l3_config_data_iter_ip4_address_for_each', - 'nm_l3_config_data_iter_ip6_address_for_each', - 'nm_l3_config_data_iter_ip_route_for_each', 'nm_l3_config_data_iter_ip4_route_for_each', + 'nm_l3_config_data_iter_ip6_address_for_each', 'nm_l3_config_data_iter_ip6_route_for_each', + 'nm_l3_config_data_iter_ip_address_for_each', + 'nm_l3_config_data_iter_ip_route_for_each', 'nm_l3_config_data_iter_obj_for_each', 'nm_manager_for_each_active_connection', 'nm_manager_for_each_active_connection_prev', diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 3138e95a9a..7f65b0d78d 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -6084,8 +6084,8 @@ delayed_action_handle_one(NMPlatform *platform) priv->delayed_action.flags &= ~DELAYED_ACTION_TYPE_REFRESH_ALL; if (_LOGt_ENABLED()) { - FOR_EACH_DELAYED_ACTION(iflags, flags) - _LOGt_delayed_action(iflags, NULL, "handle"); + FOR_EACH_DELAYED_ACTION (iflags, flags) + _LOGt_delayed_action(iflags, NULL, "handle"); } delayed_action_handle_REFRESH_ALL(platform, flags); @@ -6181,8 +6181,8 @@ delayed_action_schedule(NMPlatform *platform, DelayedActionType action_type, gpo priv->delayed_action.flags |= action_type; if (_LOGt_ENABLED()) { - FOR_EACH_DELAYED_ACTION(iflags, action_type) - _LOGt_delayed_action(iflags, user_data, "schedule"); + FOR_EACH_DELAYED_ACTION (iflags, action_type) + _LOGt_delayed_action(iflags, user_data, "schedule"); } } @@ -6757,8 +6757,7 @@ do_request_all_no_delayed_actions(NMPlatform *platform, DelayedActionType action action_type_prune &= ~DELAYED_ACTION_TYPE_REFRESH_ALL_ROUTING_RULES_ALL; } - FOR_EACH_DELAYED_ACTION(iflags, action_type_prune) - { + FOR_EACH_DELAYED_ACTION (iflags, action_type_prune) { RefreshAllType refresh_all_type = delayed_action_type_to_refresh_all_type(iflags); NMPLookup lookup; @@ -6767,8 +6766,7 @@ do_request_all_no_delayed_actions(NMPlatform *platform, DelayedActionType action nmp_cache_dirty_set_all_main(nm_platform_get_cache(platform), &lookup); } - FOR_EACH_DELAYED_ACTION(iflags, action_type) - { + FOR_EACH_DELAYED_ACTION (iflags, action_type) { RefreshAllType refresh_all_type = delayed_action_type_to_refresh_all_type(iflags); const RefreshAllInfo *refresh_all_info = refresh_all_type_get_info(refresh_all_type); nm_auto_nlmsg struct nl_msg *nlmsg = NULL;