X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fvlib_api_cli.c;h=4a86b8d76bb298ff4749f77427e6e98c3d0f9b00;hb=a462c070ab9bf593d7ed3c454ea3267929550a62;hp=d4d7c1c63dc5ce56a8a3dd89e4040846c97fea3a;hpb=e86a8edd3c14fb41ace2a12efd17bc7772bf623f;p=vpp.git

diff --git a/src/vlibmemory/vlib_api_cli.c b/src/vlibmemory/vlib_api_cli.c
old mode 100644
new mode 100755
index d4d7c1c63dc..4a86b8d76bb
--- a/src/vlibmemory/vlib_api_cli.c
+++ b/src/vlibmemory/vlib_api_cli.c
@@ -535,7 +535,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename,
       /* Copy the buffer (from the read-only mmap'ed file) */
       vec_validate (tmpbuf, size - 1 + sizeof (uword));
       clib_memcpy (tmpbuf + sizeof (uword), msg, size);
-      memset (tmpbuf, 0xf, sizeof (uword));
+      clib_memset (tmpbuf, 0xf, sizeof (uword));
 
       /*
        * Endian swap if needed. All msg data is supposed to be
@@ -621,13 +621,13 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename,
 	  if (msg_id < vec_len (am->msg_print_handlers) &&
 	      am->msg_print_handlers[msg_id] && cfgp->replay_enable)
 	    {
-	      void (*handler) (void *);
+	      void (*handler) (void *, vlib_main_t *);
 
 	      handler = (void *) am->msg_handlers[msg_id];
 
 	      if (!am->is_mp_safe[msg_id])
 		vl_msg_api_barrier_sync ();
-	      (*handler) (tmpbuf + sizeof (uword));
+	      (*handler) (tmpbuf + sizeof (uword), vm);
 	      if (!am->is_mp_safe[msg_id])
 		vl_msg_api_barrier_release ();
 	    }
@@ -721,7 +721,7 @@ api_trace_command_fn (vlib_main_t * vm,
 	    vlib_cli_output (vm,
 			     "Error while writing start of buffer trace to file\n");
 	  else if (rv < 0)
-	    vlib_cli_output (vm, "Unkown error while saving: %d", rv);
+	    vlib_cli_output (vm, "Unknown error while saving: %d", rv);
 	  else
 	    vlib_cli_output (vm, "API trace saved to %s\n", chroot_filename);
 	  vec_free (chroot_filename);
@@ -861,8 +861,8 @@ configure:
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (trace, static) =
 {
-  .path = "set api-trace [on][on tx][on rx][off][free][debug on][debug off]",
-  .short_help = "API trace",
+  .path = "set api-trace",
+  .short_help = "API trace [on][on tx][on rx][off][free][debug on][debug off]",
   .function = vl_api_trace_command,
 };
 /* *INDENT-ON* */
@@ -1082,6 +1082,7 @@ dump_api_table_file_command_fn (vlib_main_t * vm,
 
   if (compare_current)
     {
+      u8 *dashes = 0;
       ndifferences = 0;
 
       /*
@@ -1090,8 +1091,11 @@ dump_api_table_file_command_fn (vlib_main_t * vm,
        * are identical. Otherwise, the crc is different, or a message is
        * present in only one of the tables.
        */
-      vlib_cli_output (vm, "%=60s %s", "Message Name", "Result");
-
+      vlib_cli_output (vm, "%-60s | %s", "Message Name", "Result");
+      vec_validate_init_empty (dashes, 60, '-');
+      vec_terminate_c_string (dashes);
+      vlib_cli_output (vm, "%60s-|-%s", dashes, "-----------------");
+      vec_free (dashes);
       for (i = 0; i < vec_len (table);)
 	{
 	  /* Last message lonely? */
@@ -1114,24 +1118,24 @@ dump_api_table_file_command_fn (vlib_main_t * vm,
 	  ndifferences++;
 
 	  /* Only in one of two tables? */
-	  if (strncmp ((char *) table[i].name, (char *) table[i + 1].name,
-		       vec_len (table[i].name)))
+	  if (i + 1 == vec_len (table)
+	      || strcmp ((char *) table[i].name, (char *) table[i + 1].name))
 	    {
 	    last_unique:
-	      vlib_cli_output (vm, "%-60s only in %s",
+	      vlib_cli_output (vm, "%-60s | only in %s",
 			       table[i].name, table[i].which ?
 			       "image" : "file");
 	      i++;
 	      continue;
 	    }
 	  /* In both tables, but with different signatures */
-	  vlib_cli_output (vm, "%-60s definition changed", table[i].name);
+	  vlib_cli_output (vm, "%-60s | definition changed", table[i].name);
 	  i += 2;
 	}
       if (ndifferences == 0)
 	vlib_cli_output (vm, "No api message signature differences found.");
       else
-	vlib_cli_output (vm, "Found %u api message signature differences",
+	vlib_cli_output (vm, "\nFound %u api message signature differences",
 			 ndifferences);
       goto cleanup;
     }