vcl: remove unsed configs

[vpp.git] / src / vlib / cli.c

diff --git a/src/vlib/cli.c b/src/vlib/cli.c
index 5cad95e..a00ae62 100644 (file)
--- a/src/vlib/cli.c
+++ b/src/vlib/cli.c
@@ -849,17 +849,14 @@ show_memory_usage (vlib_main_t * vm,
         */
        was_enabled = clib_mem_trace_enable_disable (0);
 
-        /* *INDENT-OFF* */
-        foreach_vlib_main (
-        ({
-          vlib_cli_output (vm, "%sThread %d %s\n", index ? "\n":"", index,
-                           vlib_worker_threads[index].name);
-          vlib_cli_output (vm, "  %U\n", format_clib_mem_heap,
-                           mm->per_cpu_mheaps[index],
-                           verbose);
-          index++;
-        }));
-        /* *INDENT-ON* */
+       foreach_vlib_main ()
+         {
+           vlib_cli_output (vm, "%sThread %d %s\n", index ? "\n" : "", index,
+                            vlib_worker_threads[index].name);
+           vlib_cli_output (vm, "  %U\n", format_clib_mem_heap,
+                            mm->per_cpu_mheaps[index], verbose);
+           index++;
+         }
 
        /* Restore the trace flag */
        clib_mem_trace_enable_disable (was_enabled);
@@ -1227,6 +1224,9 @@ add_sub_command (vlib_cli_main_t * cm, uword parent_index, uword child_index)
       vec_add (sub_name, c->path + l + 1, vec_len (c->path) - (l + 1));
     }
 
+  /* "Can't happen," check mainly to shut up coverity */
+  ALWAYS_ASSERT (sub_name != 0);
+
   if (sub_name[0] == '%')
     {
       uword *q;