X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fformat.h;h=cf5e1f6dccebd585b0c25d372f9f4cad8309f6b5;hb=8d0c0c68215a2972053ba7fd8fa0f82aa14f8624;hp=7254031a0ea9f8a8301ddc96083ebea389835663;hpb=696db20e332fcbecaaef9c5505cc2e132bfaa9e2;p=vpp.git diff --git a/src/vppinfra/format.h b/src/vppinfra/format.h index 7254031a0ea..cf5e1f6dcce 100644 --- a/src/vppinfra/format.h +++ b/src/vppinfra/format.h @@ -133,8 +133,11 @@ typedef struct _unformat_input_t (and argument). */ uword (*fill_buffer) (struct _unformat_input_t * i); - /* Return values for fill buffer function which indicate whether not - input has been exhausted. */ + /* User's function to be called on input_free */ + void (*free) (struct _unformat_input_t *i); + + /* Return values for fill buffer function which indicate whether not + input has been exhausted. */ #define UNFORMAT_END_OF_INPUT (~0) #define UNFORMAT_MORE_INPUT 0 @@ -155,6 +158,8 @@ unformat_init (unformat_input_t * i, always_inline void unformat_free (unformat_input_t * i) { + if (i->free) + i->free (i); vec_free (i->buffer); vec_free (i->buffer_marks); clib_memset (i, 0, sizeof (i[0])); @@ -336,6 +341,9 @@ u8 *format_uword_bitmap (u8 *s, va_list *va); /* Setup input from Unix file. */ void unformat_init_clib_file (unformat_input_t * input, int file_descriptor); +/* Setup input from flesystem path. */ +uword unformat_init_file (unformat_input_t *input, char *fmt, ...); + /* Take input from Unix environment variable; returns 1 if variable exists zero otherwise. */ uword unformat_init_unix_env (unformat_input_t * input, char *var);