diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:50:17 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:50:22 +0000 |
| commit | b30bf840574a70b892bebc6e5281cd614cfc82c5 (patch) | |
| tree | af9a3331209ba3eb575e2de2a41da99a9dd40954 /lib/librte_cmdline | |
| parent | 01dc13012315b1f147ccce80aed68050c9e31c2d (diff) | |
| parent | 055c52583a2794da8ba1e85a48cce3832372b12f (diff) | |
Merge branch 'upstream' into 17.11.x
Change-Id: I9f728c5947bfb5ba81f00306b7997685463ca13e
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_cmdline')
| -rw-r--r-- | lib/librte_cmdline/Makefile | 1 | ||||
| -rw-r--r-- | lib/librte_cmdline/cmdline.c | 3 | ||||
| -rw-r--r-- | lib/librte_cmdline/cmdline_parse.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile index 644f68e4..2c48e62b 100644 --- a/lib/librte_cmdline/Makefile +++ b/lib/librte_cmdline/Makefile @@ -54,6 +54,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c CFLAGS += -D_GNU_SOURCE +LDLIBS += -lrte_eal # install includes INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h diff --git a/lib/librte_cmdline/cmdline.c b/lib/librte_cmdline/cmdline.c index a9c47be3..d7491651 100644 --- a/lib/librte_cmdline/cmdline.c +++ b/lib/librte_cmdline/cmdline.c @@ -205,7 +205,8 @@ cmdline_printf(const struct cmdline *cl, const char *fmt, ...) } if (ret >= BUFSIZ) ret = BUFSIZ - 1; - write(cl->s_out, buf, ret); + ret = write(cl->s_out, buf, ret); + (void)ret; free(buf); #endif } diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/librte_cmdline/cmdline_parse.c index 56491eac..3e12ee54 100644 --- a/lib/librte_cmdline/cmdline_parse.c +++ b/lib/librte_cmdline/cmdline_parse.c @@ -163,7 +163,7 @@ static int match_inst(cmdline_parse_inst_t *inst, const char *buf, unsigned int nb_match_token, void *resbuf, unsigned resbuf_size) { - cmdline_parse_token_hdr_t * token_p; + cmdline_parse_token_hdr_t *token_p = NULL; unsigned int i=0; int n = 0; struct cmdline_token_hdr token_hdr; |