From: Liping Zhang Date: Sun, 25 Sep 2016 08:54:34 +0000 (+0800) Subject: expr: log: do not print prefix if it is not set X-Git-Tag: libnftnl-1.0.7~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d74732a3917781510153fcf05cf654cda554b8e;p=thirdparty%2Flibnftnl.git 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 --- diff --git a/src/expr/log.c b/src/expr/log.c index e9654484..a231bac9 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,