change format_get_indent() to use u32 instead of uword

This follows commit d3c008d108aa2187d1a2afe2833b4de25ca2c2ab by
Christophe Fontaine.

Change-Id: I0c4df40df44be2ac0ab25817fa050a1f619eca4d
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>

diff --git a/src/plugins/dpdk/ipsec/cli.c b/src/plugins/dpdk/ipsec/cli.c
index ad6025f..9f470bf 100644 (file)
--- a/src/plugins/dpdk/ipsec/cli.c
+++ b/src/plugins/dpdk/ipsec/cli.c
@@ -501,7 +501,7 @@ u8 *
 format_dpdk_mempool (u8 * s, va_list * args)
 {
   struct rte_mempool *mp = va_arg (*args, struct rte_mempool *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   u32 count = rte_mempool_avail_count (mp);
 
   s = format (s, "%s\n%Uavailable %7d, allocated %7d total %7d\n",

diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c
index 36be24b..9405f18 100644 (file)
--- a/src/plugins/dpdk/ipsec/esp_decrypt.c
+++ b/src/plugins/dpdk/ipsec/esp_decrypt.c
@@ -76,7 +76,7 @@ static u8 * format_esp_decrypt_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 *);
   esp_decrypt_trace_t * t = va_arg (*args, esp_decrypt_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "cipher %U auth %U\n",
              format_ipsec_crypto_alg, t->crypto_alg,
@@ -403,7 +403,7 @@ static u8 * format_esp_decrypt_post_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 *);
   esp_decrypt_trace_t * t = va_arg (*args, esp_decrypt_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "cipher %U auth %U\n",
              format_ipsec_crypto_alg, t->crypto_alg,

diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c
index a1ef798..7d14a3a 100644 (file)
--- a/src/plugins/dpdk/ipsec/esp_encrypt.c
+++ b/src/plugins/dpdk/ipsec/esp_encrypt.c
@@ -79,7 +79,7 @@ format_esp_encrypt_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   esp_encrypt_trace_t *t = va_arg (*args, esp_encrypt_trace_t *);
   ip4_header_t *ih4 = (ip4_header_t *) t->packet_data;
-  uword indent = format_get_indent (s), offset;
+  u32 indent = format_get_indent (s), offset;
 
   s = format (s, "cipher %U auth %U\n",
              format_ipsec_crypto_alg, t->crypto_alg,

diff --git a/src/vnet/dpo/l2_bridge_dpo.c b/src/vnet/dpo/l2_bridge_dpo.c
index 1694781..7317fcd 100644 (file)
--- a/src/vnet/dpo/l2_bridge_dpo.c
+++ b/src/vnet/dpo/l2_bridge_dpo.c
@@ -342,7 +342,7 @@ format_l2_bridge_dpo_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 *);
     l2_bridge_dpo_trace_t * t = va_arg (*args, l2_bridge_dpo_trace_t *);
-    uword indent = format_get_indent (s);
+    u32 indent = format_get_indent (s);
     s = format (s, "%U sw_if_index:%d",
                 format_white_space, indent,
                 t->sw_if_index);

diff --git a/src/vppinfra/mheap.c b/src/vppinfra/mheap.c
index 47b7080..c703545 100644 (file)
--- a/src/vppinfra/mheap.c
+++ b/src/vppinfra/mheap.c
@@ -1165,7 +1165,8 @@ format_mheap (u8 * s, va_list * va)
   int verbose = va_arg (*va, int);
 
   mheap_t *h;
-  uword i, size, indent;
+  uword i, size;
+  u32 indent;
   clib_mem_usage_t usage;
   mheap_elt_t *first_corrupt;
 

diff --git a/src/vppinfra/std-formats.c b/src/vppinfra/std-formats.c
index a11d758..debf194 100644 (file)
--- a/src/vppinfra/std-formats.c
+++ b/src/vppinfra/std-formats.c
@@ -112,7 +112,7 @@ format_hex_bytes (u8 * s, va_list * va)
 u8 *
 format_white_space (u8 * s, va_list * va)
 {
-  uword n = va_arg (*va, uword);
+  u32 n = va_arg (*va, u32);
   while (n-- > 0)
     vec_add1 (s, ' ');
   return s;