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/bier/bier_api.c | 18 +++++++++--------- src/vnet/bier/bier_disp_table.c | 6 +++--- src/vnet/bier/bier_fmask.c | 6 +++--- src/vnet/bier/bier_imp.c | 6 +++--- src/vnet/bier/bier_table.c | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/vnet/bier') diff --git a/src/vnet/bier/bier_api.c b/src/vnet/bier/bier_api.c index e06a53edd97..366fba174e7 100644 --- a/src/vnet/bier/bier_api.c +++ b/src/vnet/bier/bier_api.c @@ -145,8 +145,8 @@ vl_api_bier_table_dump_t_handler (vl_api_bier_table_dump_t * mp) if (!reg) return; - pool_foreach(bt, bier_table_pool, - ({ + pool_foreach (bt, bier_table_pool) + { /* * skip the ecmp tables. */ @@ -154,7 +154,7 @@ vl_api_bier_table_dump_t_handler (vl_api_bier_table_dump_t * mp) { send_bier_table_details(reg, mp->context, bt); } - })); + } } static void @@ -405,10 +405,10 @@ vl_api_bier_imp_dump_t_handler (vl_api_bier_imp_dump_t * mp) if (!reg) return; - pool_foreach(bi, bier_imp_pool, - ({ + pool_foreach (bi, bier_imp_pool) + { send_bier_imp_details(reg, mp->context, bi); - })); + } } static void @@ -466,10 +466,10 @@ vl_api_bier_disp_table_dump_t_handler (vl_api_bier_disp_table_dump_t * mp) if (!reg) return; - pool_foreach(bdt, bier_disp_table_pool, - ({ + pool_foreach (bdt, bier_disp_table_pool) + { send_bier_disp_table_details(reg, mp->context, bdt); - })); + } } static void diff --git a/src/vnet/bier/bier_disp_table.c b/src/vnet/bier/bier_disp_table.c index cf9f0538df7..bdbc9a9cb59 100644 --- a/src/vnet/bier/bier_disp_table.c +++ b/src/vnet/bier/bier_disp_table.c @@ -376,12 +376,12 @@ show_bier_disp_table (vlib_main_t * vm, if (INDEX_INVALID == bdti) { - pool_foreach(bdt, bier_disp_table_pool, - ({ + pool_foreach (bdt, bier_disp_table_pool) + { vlib_cli_output(vm, "%U", format_bier_disp_table, bier_disp_table_get_index(bdt), 0, BIER_SHOW_BRIEF); - })); + } } else { diff --git a/src/vnet/bier/bier_fmask.c b/src/vnet/bier/bier_fmask.c index a58a77ff281..b7fca4dca23 100644 --- a/src/vnet/bier/bier_fmask.c +++ b/src/vnet/bier/bier_fmask.c @@ -556,12 +556,12 @@ bier_fmask_show (vlib_main_t * vm, if (INDEX_INVALID == bfmi) { - pool_foreach(bfm, bier_fmask_pool, - ({ + pool_foreach (bfm, bier_fmask_pool) + { vlib_cli_output (vm, "[@%d] %U", bier_fmask_get_index(bfm), format_bier_fmask, bier_fmask_get_index(bfm), 0); - })); + } } else { diff --git a/src/vnet/bier/bier_imp.c b/src/vnet/bier/bier_imp.c index 2da3f668cac..660b07e48ae 100644 --- a/src/vnet/bier/bier_imp.c +++ b/src/vnet/bier/bier_imp.c @@ -265,13 +265,13 @@ show_bier_imp (vlib_main_t * vm, if (INDEX_INVALID == bii) { - pool_foreach(bi, bier_imp_pool, - ({ + pool_foreach (bi, bier_imp_pool) + { vlib_cli_output(vm, "%U", format_bier_imp, bier_imp_get_index(bi), 1, BIER_SHOW_BRIEF); - })); + } } else { diff --git a/src/vnet/bier/bier_table.c b/src/vnet/bier/bier_table.c index 0e8cc1e88b4..4383053f495 100644 --- a/src/vnet/bier/bier_table.c +++ b/src/vnet/bier/bier_table.c @@ -909,10 +909,10 @@ bier_table_show_all (vlib_main_t * vm, { int ii; - pool_foreach_index(ii, bier_table_pool, - ({ + pool_foreach_index (ii, bier_table_pool) + { vlib_cli_output (vm, "%U", format_bier_table, ii, flags); - })); + } } } -- cgit 1.2.3-korg