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: add support for memfd segments
[vpp.git]
/
src
/
vppinfra
/
unformat.c
diff --git
a/src/vppinfra/unformat.c
b/src/vppinfra/unformat.c
index
7c636cc
..
e30c6d3
100644
(file)
--- a/
src/vppinfra/unformat.c
+++ b/
src/vppinfra/unformat.c
@@
-306,6
+306,11
@@
unformat_hex_string (unformat_input_t * input, va_list * va)
vec_free (s);
return 0;
}
vec_free (s);
return 0;
}
+ /* Make sure something was processed. */
+ else if (s == 0)
+ {
+ return 0;
+ }
*hexstring_return = s;
return 1;
*hexstring_return = s;
return 1;
@@
-396,7
+401,7
@@
unformat_line (unformat_input_t * i, va_list * va)
}
*result = line;
}
*result = line;
- return
1
;
+ return
vec_len (line)
;
}
/* Parse a line ending with \n and return it as an unformat_input_t. */
}
/* Parse a line ending with \n and return it as an unformat_input_t. */
@@
-405,7
+410,8
@@
unformat_line_input (unformat_input_t * i, va_list * va)
{
unformat_input_t *result = va_arg (*va, unformat_input_t *);
u8 *line;
{
unformat_input_t *result = va_arg (*va, unformat_input_t *);
u8 *line;
- unformat_user (i, unformat_line, &line);
+ if (!unformat_user (i, unformat_line, &line))
+ return 0;
unformat_init_vector (result, line);
return 1;
}
unformat_init_vector (result, line);
return 1;
}
@@
-1031,7
+1037,7
@@
unformat_init_vector (unformat_input_t * input, u8 * vector_string)
#ifdef CLIB_UNIX
static uword
#ifdef CLIB_UNIX
static uword
-
unix
_file_fill_buffer (unformat_input_t * input)
+
clib
_file_fill_buffer (unformat_input_t * input)
{
int fd = pointer_to_uword (input->fill_buffer_arg);
uword l, n;
{
int fd = pointer_to_uword (input->fill_buffer_arg);
uword l, n;
@@
-1049,9
+1055,9
@@
unix_file_fill_buffer (unformat_input_t * input)
}
void
}
void
-unformat_init_
unix
_file (unformat_input_t * input, int file_descriptor)
+unformat_init_
clib
_file (unformat_input_t * input, int file_descriptor)
{
{
- unformat_init (input,
unix
_file_fill_buffer,
+ unformat_init (input,
clib
_file_fill_buffer,
uword_to_pointer (file_descriptor, void *));
}
uword_to_pointer (file_descriptor, void *));
}