From d3c008d108aa2187d1a2afe2833b4de25ca2c2ab Mon Sep 17 00:00:00 2001 From: Christophe Fontaine Date: Mon, 2 Oct 2017 18:10:54 +0200 Subject: [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 --- src/vnet/devices/netmap/device.c | 2 +- src/vnet/devices/netmap/node.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/vnet/devices/netmap') diff --git a/src/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c index aea9ddf4eb1..e39888f4bf7 100644 --- a/src/vnet/devices/netmap/device.c +++ b/src/vnet/devices/netmap/device.c @@ -63,7 +63,7 @@ format_netmap_device (u8 * s, va_list * args) int verbose = va_arg (*args, int); netmap_main_t *nm = &netmap_main; netmap_if_t *nif = vec_elt_at_index (nm->interfaces, dev_instance); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "NETMAP interface"); if (verbose) diff --git a/src/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c index e120eeaeabd..67ddce58440 100644 --- a/src/vnet/devices/netmap/node.c +++ b/src/vnet/devices/netmap/node.c @@ -57,7 +57,7 @@ format_netmap_input_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); netmap_input_trace_t *t = va_arg (*args, netmap_input_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "netmap: hw_if_index %d next-index %d", t->hw_if_index, t->next_index); -- cgit 1.2.3-korg