summaryrefslogtreecommitdiffstats
path: root/src/plugins/memif
diff options
context:
space:
mode:
authorChristophe Fontaine <christophe.fontaine@enea.com>2017-10-02 18:10:54 +0200
committerChris Luke <chris_luke@comcast.com>2017-10-04 17:31:13 +0000
commitd3c008d108aa2187d1a2afe2833b4de25ca2c2ab (patch)
tree03c85d4348fc955b33e6a6d628b5f8b81a2c8af6 /src/plugins/memif
parent9bce0f6d7c3f7f1d5f2989ff1157c2a1039cdef6 (diff)
[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>
Diffstat (limited to 'src/plugins/memif')
-rw-r--r--src/plugins/memif/cli.c4
-rw-r--r--src/plugins/memif/device.c2
-rw-r--r--src/plugins/memif/node.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/memif/cli.c b/src/plugins/memif/cli.c
index e1bd04441e0..deca27af2ef 100644
--- a/src/plugins/memif/cli.c
+++ b/src/plugins/memif/cli.c
@@ -194,7 +194,7 @@ format_memif_queue (u8 * s, va_list * args)
memif_if_t *mif = va_arg (*args, memif_if_t *);
memif_queue_t *mq = va_arg (*args, memif_queue_t *);
uword i = va_arg (*args, uword);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "%U%s ring %u:\n",
format_white_space, indent,
@@ -218,7 +218,7 @@ format_memif_descriptor (u8 * s, va_list * args)
{
memif_if_t *mif = va_arg (*args, memif_if_t *);
memif_queue_t *mq = va_arg (*args, memif_queue_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
memif_ring_t *ring;
u16 ring_size;
u16 slot;
diff --git a/src/plugins/memif/device.c b/src/plugins/memif/device.c
index aff18f2df6b..f7eb862eef5 100644
--- a/src/plugins/memif/device.c
+++ b/src/plugins/memif/device.c
@@ -64,7 +64,7 @@ format_memif_device (u8 * s, va_list * args)
{
u32 dev_instance = va_arg (*args, u32);
int verbose = va_arg (*args, int);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "MEMIF interface");
if (verbose)
diff --git a/src/plugins/memif/node.c b/src/plugins/memif/node.c
index 4acc714902e..8190441f4b5 100644
--- a/src/plugins/memif/node.c
+++ b/src/plugins/memif/node.c
@@ -60,7 +60,7 @@ format_memif_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 *);
memif_input_trace_t *t = va_arg (*args, memif_input_trace_t *);
- uword indent = format_get_indent (s);
+ u32 indent = format_get_indent (s);
s = format (s, "memif: hw_if_index %d next-index %d",
t->hw_if_index, t->next_index);