[aarch64] Fixes CLI crashes on dpaa2 platform.

- always use 'va_args' as pointer in all format_* functions
- u32 for all 'indent' params as it's declaration was inconsistent

Change-Id: Ic5799309a6b104c9b50fec309cba789c8da99e79
Signed-off-by: Christophe Fontaine <christophe.fontaine@enea.com>

5 files changed, 5 insertions, 5 deletions

diff --git a/src/vlib/buffer.c b/src/vlib/buffer.c
index 7399b618ed4..d0d8f604528 100644
--- a/src/vlib/buffer.c
+++ b/src/vlib/buffer.c
@@ -70,7 +70,7 @@ u8 *
 format_vlib_buffer (u8 * s, va_list * args)
 {
   vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "current data %d, length %d, free-list %d, clone-count %u",
 	      b->current_data, b->current_length,
diff --git a/src/vlib/mc.c b/src/vlib/mc.c
index 8fde091389e..e57962c94de 100644
--- a/src/vlib/mc.c
+++ b/src/vlib/mc.c
@@ -2523,7 +2523,7 @@ format_mc_main (u8 * s, va_list * args)
   mc_main_t *mcm = va_arg (*args, mc_main_t *);
   mc_stream_t *t;
   mc_stream_peer_t *p, *ps;
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "MC state %U, %d streams joined, global sequence 0x%x",
 	      format_mc_relay_state, mcm->relay_state,
diff --git a/src/vlib/node_cli.c b/src/vlib/node_cli.c
index 62ab2e64bc4..619170e3027 100644
--- a/src/vlib/node_cli.c
+++ b/src/vlib/node_cli.c
@@ -102,7 +102,7 @@ format_vlib_node_stats (u8 * s, va_list * va)
   f64 x;
   f64 maxc, maxcn;
   u32 maxn;
-  uword indent;
+  u32 indent;
 
   if (!n)
     {
diff --git a/src/vlib/node_format.c b/src/vlib/node_format.c
index e9dde40fa70..19ebfc15b74 100644
--- a/src/vlib/node_format.c
+++ b/src/vlib/node_format.c
@@ -45,7 +45,7 @@ format_vlib_node_graph (u8 * s, va_list * va)
   vlib_node_main_t *nm = va_arg (*va, vlib_node_main_t *);
   vlib_node_t *n = va_arg (*va, vlib_node_t *);
   int i, j;
-  uword indent;
+  u32 indent;
   typedef struct
   {
     u32 next_node;
diff --git a/src/vlib/pci/pci.c b/src/vlib/pci/pci.c
index 7100064df42..1f1edab62e6 100644
--- a/src/vlib/pci/pci.c
+++ b/src/vlib/pci/pci.c
@@ -171,7 +171,7 @@ format_vlib_pci_vpd (u8 * s, va_list * args)
 {
   u8 *data = va_arg (*args, u8 *);
   u8 *id = va_arg (*args, u8 *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   char *string_types[] = { "PN", "EC", "SN", "MN", 0 };
   uword p = 0;
   int first_line = 1;