diff options
| author |   Christophe Fontaine <christophe.fontaine@enea.com> | 2017-10-02 18:10:54 +0200 |
|---|---|---|
| committer |   Chris Luke <chris_luke@comcast.com> | 2017-10-04 17:31:13 +0000 |
| commit | d3c008d108aa2187d1a2afe2833b4de25ca2c2ab (patch) | |
| tree | 03c85d4348fc955b33e6a6d628b5f8b81a2c8af6 /src/vnet/tcp | |
| parent | 9bce0f6d7c3f7f1d5f2989ff1157c2a1039cdef6 (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/tcp')
| -rw-r--r-- | src/vnet/tcp/tcp_format.c | 2 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_input.c | 2 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_output.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vnet/tcp/tcp_format.c b/src/vnet/tcp/tcp_format.c index 1ca2f58ea5d..6cc9ae541c6 100644 --- a/src/vnet/tcp/tcp_format.c +++ b/src/vnet/tcp/tcp_format.c @@ -59,7 +59,7 @@ format_tcp_header (u8 * s, va_list * args) tcp_header_t *tcp = va_arg (*args, tcp_header_t *); u32 max_header_bytes = va_arg (*args, u32); u32 header_bytes; - uword indent; + u32 indent; /* Nothing to do. */ if (max_header_bytes < sizeof (tcp[0])) diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index 252b0014c8c..1679f818947 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -1628,7 +1628,7 @@ format_tcp_rx_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 *); tcp_rx_trace_t *t = va_arg (*args, tcp_rx_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U\n%U%U", format_tcp_header, &t->tcp_header, 128, diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index 6482e894348..e921a4a13ea 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -55,7 +55,7 @@ format_tcp_tx_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 *); tcp_tx_trace_t *t = va_arg (*args, tcp_tx_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U\n%U%U", format_tcp_header, &t->tcp_header, 128, |