Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: don't wait indefinitely for apps to consume evts (VPP-1454)
[vpp.git]
/
src
/
vppinfra
/
format.h
diff --git
a/src/vppinfra/format.h
b/src/vppinfra/format.h
index
bc0d6d1
..
9a3a342
100644
(file)
--- 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, ...);
word fformat (FILE * f, char *fmt, ...);
word fdformat (int fd, char *fmt, ...);
-always_inline u
word
+always_inline u
32
format_get_indent (u8 * s)
{
format_get_indent (u8 * s)
{
- u
word
indent = 0;
+ u
32
indent = 0;
u8 *nl;
if (!s)
u8 *nl;
if (!s)
@@
-116,6
+116,7
@@
_(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 _
@@
-234,7
+235,7
@@
typedef uword (unformat_function_t) (unformat_input_t * input,
/* External functions. */
/* General unformatting function with programmable input stream. */
/* External functions. */
/* General unformatting function with programmable input stream. */
-uword unformat (unformat_input_t * i, char *fmt, ...);
+uword unformat (unformat_input_t * i, c
onst c
har *fmt, ...);
/* Call user defined parse function.
unformat_user (i, f, ...) is equivalent to unformat (i, "%U", f, ...) */
/* Call user defined parse function.
unformat_user (i, f, ...) is equivalent to unformat (i, "%U", f, ...) */
@@
-242,7
+243,7
@@
uword unformat_user (unformat_input_t * input, unformat_function_t * func,
...);
/* Alternate version which allows for extensions. */
...);
/* Alternate version which allows for extensions. */
-uword va_unformat (unformat_input_t * i, char *fmt, va_list * args);
+uword va_unformat (unformat_input_t * i, c
onst c
har *fmt, va_list * args);
/* Setup for unformat of Unix style command line. */
void unformat_init_command_line (unformat_input_t * input, char *argv[]);
/* Setup for unformat of Unix style command line. */
void unformat_init_command_line (unformat_input_t * input, char *argv[]);
@@
-305,11
+306,14
@@
u8 *format_hexdump (u8 * s, va_list * va);
/* Unix specific formats. */
#ifdef CLIB_UNIX
/* Setup input from Unix file. */
/* Unix specific formats. */
#ifdef CLIB_UNIX
/* Setup input from Unix file. */
-void unformat_init_
unix
_file (unformat_input_t * input, int file_descriptor);
+void unformat_init_
clib
_file (unformat_input_t * input, int file_descriptor);
/* Take input from Unix environment variable; returns
1 if variable exists zero otherwise. */
uword unformat_init_unix_env (unformat_input_t * input, char *var);
/* Take input from Unix environment variable; returns
1 if variable exists zero otherwise. */
uword unformat_init_unix_env (unformat_input_t * input, char *var);
+
+/* Unformat unix group id (gid) specified as integer or string */
+unformat_function_t unformat_unix_gid;
#endif /* CLIB_UNIX */
/* Test code. */
#endif /* CLIB_UNIX */
/* Test code. */