diff options
Diffstat (limited to 'src/vnet/mfib')
-rw-r--r-- | src/vnet/mfib/ip4_mfib.c | 12 | ||||
-rw-r--r-- | src/vnet/mfib/ip6_mfib.c | 6 | ||||
-rw-r--r-- | src/vnet/mfib/mfib_entry.c | 6 | ||||
-rw-r--r-- | src/vnet/mfib/mfib_itf.c | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/vnet/mfib/ip4_mfib.c b/src/vnet/mfib/ip4_mfib.c index 6973380ec06..9c64c4ae92c 100644 --- a/src/vnet/mfib/ip4_mfib.c +++ b/src/vnet/mfib/ip4_mfib.c @@ -396,8 +396,8 @@ format_ip4_mfib_table_memory (u8 * s, va_list * args) total_memory = 0; - pool_foreach (mfib_table, ip4_main.mfibs, - ({ + pool_foreach (mfib_table, ip4_main.mfibs) + { ip4_mfib_t *mfib = &mfib_table->v4; uword mfib_size; int i; @@ -415,7 +415,7 @@ format_ip4_mfib_table_memory (u8 * s, va_list * args) } total_memory += mfib_size; - })); + } s = format(s, "%=30s %=6d %=12ld\n", "IPv4 multicast", @@ -525,8 +525,8 @@ ip4_show_mfib (vlib_main_t * vm, break; } - pool_foreach (mfib_table, im4->mfibs, - ({ + pool_foreach (mfib_table, im4->mfibs) + { ip4_mfib_t *mfib = &mfib_table->v4; if (table_id >= 0 && table_id != (int)mfib->table_id) @@ -584,7 +584,7 @@ ip4_show_mfib (vlib_main_t * vm, { ip4_mfib_table_show_one(mfib, vm, &src, &grp, mask); } - })); + } if (memory) vlib_cli_output (vm, "totals: hash:%ld", total_hash_memory); diff --git a/src/vnet/mfib/ip6_mfib.c b/src/vnet/mfib/ip6_mfib.c index 14c724b3bef..b5e5bce8ffc 100644 --- a/src/vnet/mfib/ip6_mfib.c +++ b/src/vnet/mfib/ip6_mfib.c @@ -691,8 +691,8 @@ ip6_show_mfib (vlib_main_t * vm, break; } - pool_foreach (mfib_table, im6->mfibs, - ({ + pool_foreach (mfib_table, im6->mfibs) + { ip6_mfib_t *mfib = &mfib_table->v6; if (table_id >= 0 && table_id != (int)mfib->table_id) @@ -726,7 +726,7 @@ ip6_show_mfib (vlib_main_t * vm, { ip6_mfib_table_show_one(mfib, vm, &src, &grp, mask, cover); } - })); + } return 0; } diff --git a/src/vnet/mfib/mfib_entry.c b/src/vnet/mfib/mfib_entry.c index 471a6895b52..2d47c3cdd31 100644 --- a/src/vnet/mfib/mfib_entry.c +++ b/src/vnet/mfib/mfib_entry.c @@ -1646,13 +1646,13 @@ show_mfib_entry_command (vlib_main_t * vm, * show all */ vlib_cli_output (vm, "FIB Entries:"); - pool_foreach_index(fei, mfib_entry_pool, - ({ + pool_foreach_index (fei, mfib_entry_pool) + { vlib_cli_output (vm, "%d@%U", fei, format_mfib_entry, fei, MFIB_ENTRY_FORMAT_BRIEF); - })); + } } return (NULL); diff --git a/src/vnet/mfib/mfib_itf.c b/src/vnet/mfib/mfib_itf.c index 3e734c8a85f..99408f79f89 100644 --- a/src/vnet/mfib/mfib_itf.c +++ b/src/vnet/mfib/mfib_itf.c @@ -249,12 +249,12 @@ show_mfib_itf_command (vlib_main_t * vm, * show all */ vlib_cli_output (vm, "mFIB interfaces::"); - pool_foreach_index(mfii, mfib_itf_pool, - ({ + pool_foreach_index (mfii, mfib_itf_pool) + { vlib_cli_output (vm, "%d@%U", mfii, format_mfib_itf, mfii); - })); + } } return (NULL); |