commit d3c008d108aa2187d1a2afe2833b4de25ca2c2ab
author Christophe Fontaine <christophe.fontaine@enea.com> Mon Oct 02 18:10:54 2017 +0200
committer Chris Luke <chris_luke@comcast.com> Wed Oct 04 17:31:13 2017 +0000
tree 03c85d4348fc955b33e6a6d628b5f8b81a2c8af6
parent 9bce0f6d7c3f7f1d5f2989ff1157c2a1039cdef6

[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>

src/vnet/ethernet/arp.c

diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index 52b13e0..f46e6f5 100644
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -203,7 +203,7 @@
 {
   ethernet_arp_header_t *a = va_arg (*va, ethernet_arp_header_t *);
   u32 max_header_bytes = va_arg (*va, u32);
-  uword indent;
+  u32 indent;
   u16 l2_type, l3_type;
 
   if (max_header_bytes != 0 && sizeof (a[0]) > max_header_bytes)

src/vnet/ethernet/format.c

diff --git a/src/vnet/ethernet/format.c b/src/vnet/ethernet/format.c
index 5b58999..13a209f 100644
--- a/src/vnet/ethernet/format.c
+++ b/src/vnet/ethernet/format.c
@@ -100,7 +100,7 @@
   ethernet_type_t type = clib_net_to_host_u16 (e->type);
   ethernet_type_t vlan_type[ARRAY_LEN (m->vlan)];
   u32 n_vlan = 0, i, header_bytes;
-  uword indent;
+  u32 indent;
 
   while ((type == ETHERNET_TYPE_VLAN || type == ETHERNET_TYPE_DOT1AD
 	  || type == ETHERNET_TYPE_DOT1AH) && n_vlan < ARRAY_LEN (m->vlan))

src/vnet/ethernet/sfp.c

diff --git a/src/vnet/ethernet/sfp.c b/src/vnet/ethernet/sfp.c
index 624740e..0ebdb99 100644
--- a/src/vnet/ethernet/sfp.c
+++ b/src/vnet/ethernet/sfp.c
@@ -81,7 +81,7 @@
 format_sfp_eeprom (u8 * s, va_list * args)
 {
   sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   int i;
 
   if (e->id != SFP_ID_sfp)