From b2c31b685fd2cf28436ca32bc93e23eb24c74878 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
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 <damarion@cisco.com>
---
 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 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/vnet/ip/reass')

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