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/plugins/nat/det44/det44.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/plugins/nat/det44/det44.c')

diff --git a/src/plugins/nat/det44/det44.c b/src/plugins/nat/det44/det44.c
index 582fd20cd5d..1dbbfdfdebe 100644
--- a/src/plugins/nat/det44/det44.c
+++ b/src/plugins/nat/det44/det44.c
@@ -151,12 +151,12 @@ snat_det_add_map (ip4_address_t * in_addr, u8 in_plen,
 
   /* Add/del external address range to FIB */
   /* *INDENT-OFF* */
-  pool_foreach (i, dm->interfaces, ({
+  pool_foreach (i, dm->interfaces)  {
     if (det44_interface_is_inside(i))
       continue;
     det44_add_del_addr_to_fib(out_addr, out_plen, i->sw_if_index, is_add);
     goto out;
-  }));
+  }
   /* *INDENT-ON* */
 out:
   return 0;
@@ -204,13 +204,13 @@ det44_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del)
   // then register nodes
 
   /* *INDENT-OFF* */
-  pool_foreach (tmp, dm->interfaces, ({
+  pool_foreach (tmp, dm->interfaces)  {
     if (tmp->sw_if_index == sw_if_index)
       {
         i = tmp;
         goto out;
       }
-  }));
+  }
   /* *INDENT-ON* */
 out:
 
@@ -302,10 +302,10 @@ out:
       // add/del outside address to FIB
       snat_det_map_t *mp;
       /* *INDENT-OFF* */
-      pool_foreach (mp, dm->det_maps, ({
+      pool_foreach (mp, dm->det_maps)  {
         det44_add_del_addr_to_fib(&mp->out_addr,
                                   mp->out_plen, sw_if_index, !is_del);
-      }));
+      }
       /* *INDENT-ON* */
     }
   return 0;
@@ -328,14 +328,14 @@ det44_expire_walk_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
   vlib_process_get_events (vm, NULL);
   u32 now = (u32) vlib_time_now (vm);
   /* *INDENT-OFF* */
-  pool_foreach (mp, dm->det_maps, ({
+  pool_foreach (mp, dm->det_maps)  {
     vec_foreach(ses, mp->sessions)
       {
         /* Delete if session expired */
         if (ses->in_port && (ses->expire < now))
           snat_det_ses_close (mp, ses);
       }
-  }));
+  }
   /* *INDENT-ON* */
   return 0;
 }
@@ -429,10 +429,10 @@ det44_plugin_disable ()
   vec_free (interfaces);
 
   /* *INDENT-OFF* */
-  pool_foreach (mp, dm->det_maps,
-  ({
+  pool_foreach (mp, dm->det_maps)
+   {
     vec_free (mp->sessions);
-  }));
+  }
   /* *INDENT-ON* */
 
   det44_reset_timeouts ();
@@ -468,15 +468,15 @@ det44_update_outside_fib (ip4_main_t * im,
     return;
 
   /* *INDENT-OFF* */
-  pool_foreach (i, dm->interfaces,
-    ({
+  pool_foreach (i, dm->interfaces)
+     {
       if (i->sw_if_index == sw_if_index)
         {
           if (!(det44_interface_is_outside (i)))
 	    return;
           match = 1;
         }
-    }));
+    }
   /* *INDENT-ON* */
 
   if (!match)
-- 
cgit 1.2.3-korg