Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: move vppinfra tests to src/vppinfra/test
[vpp.git]
/
src
/
vppinfra
/
format.h
diff --git
a/src/vppinfra/format.h
b/src/vppinfra/format.h
index
9434447
..
6e958e2
100644
(file)
--- a/
src/vppinfra/format.h
+++ b/
src/vppinfra/format.h
@@
-87,13
+87,14
@@
format_get_indent (u8 * s)
return indent;
}
return indent;
}
-#define _(f) u8 * f (u8 * s, va_list * va)
+#define _(f)
__clib_export
u8 * f (u8 * s, va_list * va)
/* Standard user-defined formats. */
_(format_vec32);
_(format_vec_uword);
_(format_ascii_bytes);
_(format_hex_bytes);
/* Standard user-defined formats. */
_(format_vec32);
_(format_vec_uword);
_(format_ascii_bytes);
_(format_hex_bytes);
+_(format_hex_bytes_no_wrap);
_(format_white_space);
_(format_f64);
_(format_time_interval);
_(format_white_space);
_(format_f64);
_(format_time_interval);
@@
-116,7
+117,6
@@
_(format_timeval);
_(format_time_float);
_(format_signal);
_(format_ucontext_pc);
_(format_time_float);
_(format_signal);
_(format_ucontext_pc);
-_(format_page_map);
#endif
#undef _
#endif
#undef _
@@
-297,6
+297,12
@@
unformat_function_t unformat_memory_size;
/* Unparse memory size e.g. 100, 100k, 100m, 100g. */
u8 *format_memory_size (u8 * s, va_list * va);
/* Unparse memory size e.g. 100, 100k, 100m, 100g. */
u8 *format_memory_size (u8 * s, va_list * va);
+/* Parse memory page size e.g. 4K, 2M */
+unformat_function_t unformat_log2_page_size;
+
+/* Unparse memory page size e.g. 4K, 2M */
+u8 *format_log2_page_size (u8 * s, va_list * va);
+
/* Format c identifier: e.g. a_name -> "a name". */
u8 *format_c_identifier (u8 * s, va_list * va);
/* Format c identifier: e.g. a_name -> "a name". */
u8 *format_c_identifier (u8 * s, va_list * va);
@@
-316,6
+322,8
@@
uword unformat_init_unix_env (unformat_input_t * input, char *var);
unformat_function_t unformat_unix_gid;
#endif /* CLIB_UNIX */
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);
/* Test code. */
int test_format_main (unformat_input_t * input);
int test_unformat_main (unformat_input_t * input);