X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fformat.h;h=678029e2a16a739429692c3e78347487efd2ba89;hb=7249b90ab21c20138907e692dcb6032aea9e2f0f;hp=3c4aec99c2bbc2733f8d2f32290274441dd38704;hpb=59b2565cd91a67ced650739f36129650830211ac;p=vpp.git

diff --git a/src/vppinfra/format.h b/src/vppinfra/format.h
index 3c4aec99c2b..678029e2a16 100644
--- a/src/vppinfra/format.h
+++ b/src/vppinfra/format.h
@@ -68,10 +68,10 @@ word va_fformat (FILE * f, char *fmt, va_list * va);
 word fformat (FILE * f, char *fmt, ...);
 word fdformat (int fd, char *fmt, ...);
 
-always_inline uword
+always_inline u32
 format_get_indent (u8 * s)
 {
-  uword indent = 0;
+  u32 indent = 0;
   u8 *nl;
 
   if (!s)
@@ -94,6 +94,7 @@ _(format_vec32);
 _(format_vec_uword);
 _(format_ascii_bytes);
 _(format_hex_bytes);
+_(format_hex_bytes_no_wrap);
 _(format_white_space);
 _(format_f64);
 _(format_time_interval);
@@ -116,6 +117,7 @@ _(format_timeval);
 _(format_time_float);
 _(format_signal);
 _(format_ucontext_pc);
+_(format_page_map);
 #endif
 
 #undef _
@@ -152,7 +154,7 @@ unformat_init (unformat_input_t * i,
 	       uword (*fill_buffer) (unformat_input_t *),
 	       void *fill_buffer_arg)
 {
-  memset (i, 0, sizeof (i[0]));
+  clib_memset (i, 0, sizeof (i[0]));
   i->fill_buffer = fill_buffer;
   i->fill_buffer_arg = fill_buffer_arg;
 }
@@ -162,7 +164,7 @@ unformat_free (unformat_input_t * i)
 {
   vec_free (i->buffer);
   vec_free (i->buffer_marks);
-  memset (i, 0, sizeof (i[0]));
+  clib_memset (i, 0, sizeof (i[0]));
 }
 
 always_inline uword
@@ -315,6 +317,8 @@ uword unformat_init_unix_env (unformat_input_t * input, char *var);
 unformat_function_t unformat_unix_gid;
 #endif /* CLIB_UNIX */
 
+uword unformat_data_size (unformat_input_t * input, va_list * args);
+
 /* Test code. */
 int test_format_main (unformat_input_t * input);
 int test_unformat_main (unformat_input_t * input);