X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_cmdline%2Fcmdline.c;h=cfd703e5b3728f823fa7e04fafdf2614b364dfbd;hb=b1692872aaff0ccb018e98d6d46fd7506a825513;hp=591b78b0f7403ee2c1d9c22e16aded766ba07d42;hpb=add6c87ebe9337c66c3009f458c48fbccb727558;p=dpdk.git diff --git a/lib/librte_cmdline/cmdline.c b/lib/librte_cmdline/cmdline.c index 591b78b0f7..cfd703e5b3 100644 --- a/lib/librte_cmdline/cmdline.c +++ b/lib/librte_cmdline/cmdline.c @@ -24,7 +24,7 @@ static void cmdline_valid_buffer(struct rdline *rdl, const char *buf, - __attribute__((unused)) unsigned int size) + __rte_unused unsigned int size) { struct cmdline *cl = rdl->opaque; int ret; @@ -69,7 +69,7 @@ cmdline_set_prompt(struct cmdline *cl, const char *prompt) { if (!cl || !prompt) return; - snprintf(cl->prompt, sizeof(cl->prompt), "%s", prompt); + strlcpy(cl->prompt, prompt, sizeof(cl->prompt)); } struct cmdline * @@ -126,35 +126,11 @@ cmdline_printf(const struct cmdline *cl, const char *fmt, ...) if (!cl || !fmt) return; -#ifdef _GNU_SOURCE if (cl->s_out < 0) return; va_start(ap, fmt); vdprintf(cl->s_out, fmt, ap); va_end(ap); -#else - int ret; - char *buf; - - if (cl->s_out < 0) - return; - - buf = malloc(BUFSIZ); - if (buf == NULL) - return; - va_start(ap, fmt); - ret = vsnprintf(buf, BUFSIZ, fmt, ap); - va_end(ap); - if (ret < 0) { - free(buf); - return; - } - if (ret >= BUFSIZ) - ret = BUFSIZ - 1; - ret = write(cl->s_out, buf, ret); - (void)ret; - free(buf); -#endif } int