From 1d74732a3917781510153fcf05cf654cda554b8e Mon Sep 17 00:00:00 2001 From: Liping Zhang Date: Sun, 25 Sep 2016 16:54:34 +0800 Subject: expr: log: do not print prefix if it is not set This will avoid the following ugly display output: [ log prefix (null) ] Signed-off-by: Liping Zhang Signed-off-by: Pablo Neira Ayuso --- src/expr/log.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/expr/log.c b/src/expr/log.c index e965448..a231bac 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -230,8 +230,10 @@ static int nftnl_expr_log_snprintf_default(char *buf, size_t size, struct nftnl_expr_log *log = nftnl_expr_data(e); int ret, offset = 0, len = size; - ret = snprintf(buf, len, "prefix %s ", log->prefix); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) { + ret = snprintf(buf, len, "prefix %s ", log->prefix); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } if (e->flags & (1 << NFTNL_EXPR_LOG_GROUP)) { ret = snprintf(buf + offset, len, -- cgit v1.2.3