summaryrefslogtreecommitdiffstats
path: root/src/vnet/mfib
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/vnet/mfib
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/vnet/mfib')
-rw-r--r--src/vnet/mfib/mfib_table.c6
-rw-r--r--src/vnet/mfib/mfib_table.h2
-rw-r--r--src/vnet/mfib/mfib_test.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/src/vnet/mfib/mfib_table.c b/src/vnet/mfib/mfib_table.c
index 838864ff7c0..efeadefb2d6 100644
--- a/src/vnet/mfib/mfib_table.c
+++ b/src/vnet/mfib/mfib_table.c
@@ -615,10 +615,10 @@ mfib_table_walk (u32 fib_index,
}
u8*
-format_mfib_table_name (u8* s, va_list ap)
+format_mfib_table_name (u8* s, va_list *ap)
{
- fib_node_index_t fib_index = va_arg(ap, fib_node_index_t);
- fib_protocol_t proto = va_arg(ap, int); // int promotion
+ fib_node_index_t fib_index = va_arg(*ap, fib_node_index_t);
+ fib_protocol_t proto = va_arg(*ap, int); // int promotion
mfib_table_t *mfib_table;
mfib_table = mfib_table_get(fib_index, proto);
diff --git a/src/vnet/mfib/mfib_table.h b/src/vnet/mfib/mfib_table.h
index 93f90dd5d1d..6a5810291fc 100644
--- a/src/vnet/mfib/mfib_table.h
+++ b/src/vnet/mfib/mfib_table.h
@@ -80,7 +80,7 @@ typedef struct mfib_table_t_
* @brief
* Format the description/name of the table
*/
-extern u8* format_mfib_table_name(u8* s, va_list ap);
+extern u8* format_mfib_table_name(u8* s, va_list *ap);
/**
* @brief
diff --git a/src/vnet/mfib/mfib_test.c b/src/vnet/mfib/mfib_test.c
index 2562bc14b6a..3ec00a74aa8 100644
--- a/src/vnet/mfib/mfib_test.c
+++ b/src/vnet/mfib/mfib_test.c
@@ -180,7 +180,7 @@ mfib_test_mk_intf (u32 ninterfaces)
static int
mfib_test_validate_rep_v (const replicate_t *rep,
u16 n_buckets,
- va_list ap)
+ va_list *ap)
{
const dpo_id_t *dpo;
adj_index_t ai;
@@ -192,8 +192,8 @@ mfib_test_validate_rep_v (const replicate_t *rep,
for (bucket = 0; bucket < n_buckets; bucket++)
{
- dt = va_arg(ap, int); // type promotion
- ai = va_arg(ap, adj_index_t);
+ dt = va_arg(*ap, int); // type promotion
+ ai = va_arg(*ap, adj_index_t);
dpo = replicate_get_bucket_i(rep, bucket);
MFIB_TEST_REP((dt == dpo->dpoi_type),
@@ -275,7 +275,7 @@ mfib_test_entry (fib_node_index_t fei,
format_mfib_prefix, &pfx,
format_dpo_type, tmp.dpoi_type);
- res = mfib_test_validate_rep_v(rep, n_buckets, ap);
+ res = mfib_test_validate_rep_v(rep, n_buckets, &ap);
dpo_reset(&tmp);
}