misc: move to new pool_foreach macros

[vpp.git] / src / vnet / bier / bier_disp_table.c

diff --git a/src/vnet/bier/bier_disp_table.c b/src/vnet/bier/bier_disp_table.c
index c663286..bdbc9a9 100644 (file)
--- a/src/vnet/bier/bier_disp_table.c
+++ b/src/vnet/bier/bier_disp_table.c
@@ -75,7 +75,7 @@ bier_disp_table_add_or_lock (u32 table_id)
         /**
          * Set the result for each entry in the DB to be invalid
          */
-        memset(bdt->bdt_db, 0xff, sizeof(bdt->bdt_db));
+        clib_memset(bdt->bdt_db, 0xff, sizeof(bdt->bdt_db));
     }
     else
     {
@@ -376,17 +376,24 @@ 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
     {
-        vlib_cli_output(vm, "%U", format_bier_disp_table, bdti, 0,
-                        BIER_SHOW_DETAIL);
+        if (pool_is_free_index(bier_disp_table_pool, bdti))
+        {
+            vlib_cli_output(vm, "No such BIER disp table: %d", bdti);
+        }
+        else
+        {
+            vlib_cli_output(vm, "%U", format_bier_disp_table, bdti, 0,
+                            BIER_SHOW_DETAIL);
+        }
     }
     return (NULL);
 }