From fe61f81e54dc3647adfedc6659dd6617078c84f4 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 23 Jun 2014 11:38:19 +0200 Subject: expr: target: Do not print unset values in xml file It changes the parse and snprintf functions to omit unset values. Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/target.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/expr/target.c b/src/expr/target.c index 623d22c..101f3d0 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -199,10 +199,8 @@ nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, name = nft_mxml_str_parse(tree, "name", MXML_DESCEND_FIRST, NFT_XML_MAND, err); - if (name == NULL) - return -1; - - nft_rule_expr_set_str(e, NFT_EXPR_TG_NAME, name); + if (name != NULL) + nft_rule_expr_set_str(e, NFT_EXPR_TG_NAME, name); /* tg->info is ignored until other solution is reached */ @@ -232,8 +230,10 @@ static int nft_rule_exp_target_snprintf_xml(char *buf, size_t len, int ret, size=len; int offset = 0; - ret = snprintf(buf, len, "%s", target->name); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_EXPR_TG_NAME)) { + ret = snprintf(buf, len, "%s", target->name); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } return offset; } -- cgit v1.2.3