From b2c31b685fd2cf28436ca32bc93e23eb24c74878 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sun, 13 Dec 2020 21:47:40 +0100 Subject: misc: move to new pool_foreach macros Type: refactor Change-Id: Ie67dc579e88132ddb1ee4a34cb69f96920101772 Signed-off-by: Damjan Marion --- src/vnet/ip/ip4_forward.c | 6 +++--- src/vnet/ip/ip6_forward.c | 6 +++--- src/vnet/ip/ip_api.c | 42 +++++++++++++++++++------------------- src/vnet/ip/ip_container_proxy.c | 12 +++++------ src/vnet/ip/reass/ip4_full_reass.c | 8 ++++---- src/vnet/ip/reass/ip4_sv_reass.c | 8 ++++---- src/vnet/ip/reass/ip6_full_reass.c | 8 ++++---- src/vnet/ip/reass/ip6_sv_reass.c | 8 ++++---- 8 files changed, 49 insertions(+), 49 deletions(-) (limited to 'src/vnet/ip') diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 77ea4c5524e..bb70805b4e6 100644 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -677,8 +677,8 @@ ip4_add_del_interface_address_internal (vlib_main_t * vm, ip_interface_address_t *ia; vnet_sw_interface_t *sif; - pool_foreach(sif, vnm->interface_main.sw_interfaces, - ({ + pool_foreach (sif, vnm->interface_main.sw_interfaces) + { if (im->fib_index_by_sw_if_index[sw_if_index] == im->fib_index_by_sw_if_index[sif->sw_if_index]) { @@ -728,7 +728,7 @@ ip4_add_del_interface_address_internal (vlib_main_t * vm, } })); } - })); + } } /* *INDENT-ON* */ diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index cd753b044b1..659955ad42d 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -369,8 +369,8 @@ ip6_add_del_interface_address (vlib_main_t * vm, ip_interface_address_t *ia; vnet_sw_interface_t *sif; - pool_foreach(sif, vnm->interface_main.sw_interfaces, - ({ + pool_foreach (sif, vnm->interface_main.sw_interfaces) + { if (im->fib_index_by_sw_if_index[sw_if_index] == im->fib_index_by_sw_if_index[sif->sw_if_index]) { @@ -417,7 +417,7 @@ ip6_add_del_interface_address (vlib_main_t * vm, } })); } - })); + } } /* *INDENT-ON* */ diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c index 3bdb53cd9ff..1d0dea86443 100644 --- a/src/vnet/ip/ip_api.c +++ b/src/vnet/ip/ip_api.c @@ -154,17 +154,17 @@ vl_api_ip_table_dump_t_handler (vl_api_ip_table_dump_t * mp) return; /* *INDENT-OFF* */ - pool_foreach (fib_table, ip4_main.fibs, - ({ + pool_foreach (fib_table, ip4_main.fibs) + { send_ip_table_details(am, reg, mp->context, fib_table); - })); - pool_foreach (fib_table, ip6_main.fibs, - ({ + } + pool_foreach (fib_table, ip6_main.fibs) + { /* don't send link locals */ if (fib_table->ft_flags & FIB_TABLE_FLAG_IP6_LL) continue; send_ip_table_details(am, reg, mp->context, fib_table); - })); + } /* *INDENT-ON* */ } @@ -294,14 +294,14 @@ vl_api_ip_mtable_dump_t_handler (vl_api_ip_mtable_dump_t * mp) return; /* *INDENT-OFF* */ - pool_foreach (mfib_table, ip4_main.mfibs, - ({ + pool_foreach (mfib_table, ip4_main.mfibs) + { send_ip_mtable_details (reg, mp->context, mfib_table); - })); - pool_foreach (mfib_table, ip6_main.mfibs, - ({ + } + pool_foreach (mfib_table, ip6_main.mfibs) + { send_ip_mtable_details (reg, mp->context, mfib_table); - })); + } /* *INDENT-ON* */ } @@ -950,8 +950,8 @@ vl_api_ip_unnumbered_dump_t_handler (vl_api_ip_unnumbered_dump_t * mp) else { /* *INDENT-OFF* */ - pool_foreach (si, im->sw_interfaces, - ({ + pool_foreach (si, im->sw_interfaces) + { if ((si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)) { send_ip_unnumbered_details(am, reg, @@ -959,7 +959,7 @@ vl_api_ip_unnumbered_dump_t_handler (vl_api_ip_unnumbered_dump_t * mp) si->unnumbered_sw_if_index, mp->context); } - })); + } /* *INDENT-ON* */ } @@ -985,10 +985,10 @@ vl_api_ip_dump_t_handler (vl_api_ip_dump_t * mp) sorted_sis = vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces)); _vec_len (sorted_sis) = 0; /* *INDENT-OFF* */ - pool_foreach (si, im->sw_interfaces, - ({ + pool_foreach (si, im->sw_interfaces) + { vec_add1 (sorted_sis, si[0]); - })); + } /* *INDENT-ON* */ vec_foreach (si, sorted_sis) @@ -1429,8 +1429,8 @@ vl_api_ip_table_flush_t_handler (vl_api_ip_table_flush_t * mp) /* Shut down interfaces in this FIB / clean out intfc routes */ /* *INDENT-OFF* */ - pool_foreach (si, im->sw_interfaces, - ({ + pool_foreach (si, im->sw_interfaces) + { if (fib_index == fib_table_get_index_for_sw_if_index (fproto, si->sw_if_index)) { @@ -1438,7 +1438,7 @@ vl_api_ip_table_flush_t_handler (vl_api_ip_table_flush_t * mp) flags &= ~VNET_SW_INTERFACE_FLAG_ADMIN_UP; vnet_sw_interface_set_flags (vnm, si->sw_if_index, flags); } - })); + } /* *INDENT-ON* */ fib_table_flush (fib_index, fproto, FIB_SOURCE_API); diff --git a/src/vnet/ip/ip_container_proxy.c b/src/vnet/ip/ip_container_proxy.c index e90be8b45d3..2c94b70ec85 100644 --- a/src/vnet/ip/ip_container_proxy.c +++ b/src/vnet/ip/ip_container_proxy.c @@ -139,20 +139,20 @@ ip_container_proxy_walk (ip_container_proxy_cb_t cb, void *ctx) }; /* *INDENT-OFF* */ - pool_foreach (fib_table, ip4_main.fibs, - ({ + pool_foreach (fib_table, ip4_main.fibs) + { fib_table_walk(fib_table->ft_index, FIB_PROTOCOL_IP4, ip_container_proxy_fib_table_walk, &wctx); - })); - pool_foreach (fib_table, ip6_main.fibs, - ({ + } + pool_foreach (fib_table, ip6_main.fibs) + { fib_table_walk(fib_table->ft_index, FIB_PROTOCOL_IP6, ip_container_proxy_fib_table_walk, &wctx); - })); + } /* *INDENT-ON* */ } diff --git a/src/vnet/ip/reass/ip4_full_reass.c b/src/vnet/ip/reass/ip4_full_reass.c index ce7771f8e43..ecd2fb0e5c6 100644 --- a/src/vnet/ip/reass/ip4_full_reass.c +++ b/src/vnet/ip/reass/ip4_full_reass.c @@ -1576,13 +1576,13 @@ ip4_full_reass_walk_expired (vlib_main_t * vm, vec_reset_length (pool_indexes_to_free); /* *INDENT-OFF* */ - pool_foreach_index (index, rt->pool, ({ + pool_foreach_index (index, rt->pool) { reass = pool_elt_at_index (rt->pool, index); if (now > reass->last_heard + rm->timeout) { vec_add1 (pool_indexes_to_free, index); } - })); + } /* *INDENT-ON* */ int *i; /* *INDENT-OFF* */ @@ -1696,9 +1696,9 @@ show_ip4_reass (vlib_main_t * vm, if (details) { /* *INDENT-OFF* */ - pool_foreach (reass, rt->pool, { + pool_foreach (reass, rt->pool) { vlib_cli_output (vm, "%U", format_ip4_reass, vm, reass); - }); + } /* *INDENT-ON* */ } sum_reass_n += rt->reass_n; diff --git a/src/vnet/ip/reass/ip4_sv_reass.c b/src/vnet/ip/reass/ip4_sv_reass.c index 8f3b0f946a5..c74f8e5b661 100644 --- a/src/vnet/ip/reass/ip4_sv_reass.c +++ b/src/vnet/ip/reass/ip4_sv_reass.c @@ -1203,13 +1203,13 @@ ip4_sv_reass_walk_expired (vlib_main_t * vm, vec_reset_length (pool_indexes_to_free); /* *INDENT-OFF* */ - pool_foreach_index (index, rt->pool, ({ + pool_foreach_index (index, rt->pool) { reass = pool_elt_at_index (rt->pool, index); if (now > reass->last_heard + rm->timeout) { vec_add1 (pool_indexes_to_free, index); } - })); + } /* *INDENT-ON* */ int *i; /* *INDENT-OFF* */ @@ -1312,9 +1312,9 @@ show_ip4_reass (vlib_main_t * vm, if (details) { /* *INDENT-OFF* */ - pool_foreach (reass, rt->pool, { + pool_foreach (reass, rt->pool) { vlib_cli_output (vm, "%U", format_ip4_sv_reass, vm, reass); - }); + } /* *INDENT-ON* */ } sum_reass_n += rt->reass_n; diff --git a/src/vnet/ip/reass/ip6_full_reass.c b/src/vnet/ip/reass/ip6_full_reass.c index f1a3606d41a..80a31e83215 100644 --- a/src/vnet/ip/reass/ip6_full_reass.c +++ b/src/vnet/ip/reass/ip6_full_reass.c @@ -1520,13 +1520,13 @@ ip6_full_reass_walk_expired (vlib_main_t * vm, vec_reset_length (pool_indexes_to_free); /* *INDENT-OFF* */ - pool_foreach_index (index, rt->pool, ({ + pool_foreach_index (index, rt->pool) { reass = pool_elt_at_index (rt->pool, index); if (now > reass->last_heard + rm->timeout) { vec_add1 (pool_indexes_to_free, index); } - })); + } /* *INDENT-ON* */ int *i; /* *INDENT-OFF* */ @@ -1665,9 +1665,9 @@ show_ip6_full_reass (vlib_main_t * vm, unformat_input_t * input, if (details) { /* *INDENT-OFF* */ - pool_foreach (reass, rt->pool, { + pool_foreach (reass, rt->pool) { vlib_cli_output (vm, "%U", format_ip6_full_reass, vm, reass); - }); + } /* *INDENT-ON* */ } sum_reass_n += rt->reass_n; diff --git a/src/vnet/ip/reass/ip6_sv_reass.c b/src/vnet/ip/reass/ip6_sv_reass.c index 7c13f4b7fac..c5c84e5f93a 100644 --- a/src/vnet/ip/reass/ip6_sv_reass.c +++ b/src/vnet/ip/reass/ip6_sv_reass.c @@ -1031,13 +1031,13 @@ ip6_sv_reass_walk_expired (vlib_main_t * vm, vec_reset_length (pool_indexes_to_free); /* *INDENT-OFF* */ - pool_foreach_index (index, rt->pool, ({ + pool_foreach_index (index, rt->pool) { reass = pool_elt_at_index (rt->pool, index); if (now > reass->last_heard + rm->timeout) { vec_add1 (pool_indexes_to_free, index); } - })); + } /* *INDENT-ON* */ int *i; /* *INDENT-OFF* */ @@ -1138,9 +1138,9 @@ show_ip6_sv_reass (vlib_main_t * vm, unformat_input_t * input, if (details) { /* *INDENT-OFF* */ - pool_foreach (reass, rt->pool, { + pool_foreach (reass, rt->pool) { vlib_cli_output (vm, "%U", format_ip6_sv_reass, vm, reass); - }); + } /* *INDENT-ON* */ } sum_reass_n += rt->reass_n; -- cgit 1.2.3-korg