Use while with brackets in favor of comma operator. In flow print replace with temporary variable.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- app/test-pmd/cmdline_flow.c | 6 ++++-- app/test-pmd/config.c | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 83d398f8ee..a54463f718 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -8333,8 +8333,10 @@ parse_prefix(struct context *ctx, const struct token *token, if (!ctx->object) return len; extra -= u; - while (u--) - (v <<= 1, v |= 1); + while (u--) { + v <<= 1; + v |= 1; + } v <<= extra; if (!arg_entry_bf_fill(ctx->object, v, arg) || !arg_entry_bf_fill(ctx->objmask, -1, arg)) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 0fda8e99f8..14af69bce5 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1497,7 +1497,7 @@ port_flow_complain(struct rte_flow_error *error) [RTE_FLOW_ERROR_TYPE_ACTION] = "specific action", }; const char *errstr; - char buf[32]; + char cause_buf[32] = ""; int err = rte_errno; if ((unsigned int)error->type >= RTE_DIM(errstrlist) || @@ -1505,10 +1505,12 @@ port_flow_complain(struct rte_flow_error *error) errstr = "unknown type"; else errstr = errstrlist[error->type]; + + if (error->cause) + snprintf(cause_buf, sizeof(cause_buf), "cause: %p, ", error->cause); + fprintf(stderr, "%s(): Caught PMD error type %d (%s): %s%s: %s\n", - __func__, error->type, errstr, - error->cause ? (snprintf(buf, sizeof(buf), "cause: %p, ", - error->cause), buf) : "", + __func__, error->type, errstr, cause_buf, error->message ? error->message : "(no stated reason)", rte_strerror(err)); -- 2.47.2