misc: move to new pool_foreach macros

[vpp.git] / src / plugins / cnat / cnat_session.c

diff --git a/src/plugins/cnat/cnat_session.c b/src/plugins/cnat/cnat_session.c
index a80e367..c3d8aa7 100644 (file)
--- a/src/plugins/cnat/cnat_session.c
+++ b/src/plugins/cnat/cnat_session.c
@@ -165,7 +165,7 @@ cnat_session_scan (vlib_main_t * vm, f64 start_time, int i)
   if (alloc_arena (h) == 0)
     return 0.0;
 
-  for (i = 0; i < h->nbuckets; i++)
+  for ( /* caller saves starting point */ ; i < h->nbuckets; i++)
     {
       /* allow no more than 100us without a pause */
       if ((vlib_time_now (vm) - start_time) > 10e-5)
@@ -243,11 +243,11 @@ cnat_timestamp_show (vlib_main_t * vm,
   cnat_timestamp_t *ts;
   clib_rwlock_reader_lock (&cnat_main.ts_lock);
     /* *INDENT-OFF* */
-  pool_foreach (ts, cnat_timestamps, ({
+  pool_foreach (ts, cnat_timestamps)  {
     vlib_cli_output (vm, "[%d] last_seen:%f lifetime:%u ref:%u",
                     ts - cnat_timestamps,
                     ts->last_seen, ts->lifetime, ts->refcnt);
-  }));
+  }
   /* *INDENT-ON* */
   clib_rwlock_reader_unlock (&cnat_main.ts_lock);
   return (NULL);