misc: move to new pool_foreach macros

[vpp.git] / src / vnet / session / session_cli.c

diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c
index 9f6d74c..a919754 100644 (file)
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -329,21 +329,22 @@ session_cli_show_all_sessions (vlib_main_t * vm, int verbose)
        }
 
       if (verbose == 1)
-       vlib_cli_output (vm, "%s%-50s%-15s%-10s%-10s",
+       vlib_cli_output (vm, "%s%-" SESSION_CLI_ID_LEN "s%-"
+                        SESSION_CLI_STATE_LEN "s%-10s%-10s",
                         thread_index ? "\n" : "",
                         "Connection", "State", "Rx-f", "Tx-f");
 
       n_closed = 0;
 
       /* *INDENT-OFF* */
-      pool_foreach(s, pool, ({
+      pool_foreach (s, pool)  {
         if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED)
           {
             n_closed += 1;
             continue;
           }
         vlib_cli_output (vm, "%U", format_session, s, verbose);
-      }));
+      }
       /* *INDENT-ON* */
 
       if (!n_closed)
@@ -617,9 +618,11 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
   if (do_listeners)
     {
       sst = session_type_from_proto_and_ip (transport_proto, 1);
-      vlib_cli_output (vm, "%-50s%-24s", "Listener", "App");
+      vlib_cli_output (vm, "%-" SESSION_CLI_ID_LEN "s%-24s", "Listener",
+                      "App");
+
       /* *INDENT-OFF* */
-      pool_foreach (s, smm->wrk[0].sessions, ({
+      pool_foreach (s, smm->wrk[0].sessions)  {
        if (s->session_state != SESSION_STATE_LISTENING
            || s->session_type != sst)
          continue;
@@ -627,7 +630,7 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
        app_name = application_name_from_index (app_wrk->app_index);
        vlib_cli_output (vm, "%U%-25v%", format_session, s, 0,
                         app_name);
-      }));
+      }
       /* *INDENT-ON* */
       goto done;
     }
@@ -724,9 +727,9 @@ clear_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
       /* *INDENT-OFF* */
       vec_foreach (wrk, smm->wrk)
        {
-         pool_foreach(session, wrk->sessions, ({
+         pool_foreach (session, wrk->sessions)  {
            clear_session (session);
-         }));
+         }
        };
       /* *INDENT-ON* */
     }