From: Ana Rey <anarey@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ana Rey <anarey@gmail.com>
Subject: [libnftnl PATCH 3/4] expr: target: Do not print unset values in xml file
Date: Mon, 23 Jun 2014 11:38:19 +0200 [thread overview]
Message-ID: <1403516300-32649-4-git-send-email-anarey@gmail.com> (raw)
In-Reply-To: <1403516300-32649-1-git-send-email-anarey@gmail.com>
It changes the parse and snprintf functions to omit unset values.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/target.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/expr/target.c b/src/expr/target.c
index da25e68..01bf69d 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 */
@@ -233,8 +231,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, "<name>%s</name>", target->name);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ if (e->flags & (1 << NFT_EXPR_TG_NAME)) {
+ ret = snprintf(buf, len, "<name>%s</name>", target->name);
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ }
return offset;
}
--
2.0.0
next prev parent reply other threads:[~2014-06-23 9:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-23 9:38 [libnftnl PATCH 0/4] expr: target: Do not print unset values in xml and json files Ana Rey
2014-06-23 9:38 ` [libnftnl PATCH 1/4] expr: target: get a nft_rule_expr type in nft_rule_expr_target_snprintf_* functions Ana Rey
2014-06-23 9:38 ` [libnftnl PATCH 2/4] expr: target: Use nft_rule_expr_set_* in the xml parsing code Ana Rey
2014-06-23 9:38 ` Ana Rey [this message]
2014-06-23 9:38 ` [libnftnl PATCH 4/4] expr: target: Do not print unset values in json file Ana Rey
2014-06-23 18:06 ` [libnftnl PATCH 0/4] expr: target: Do not print unset values in xml and json files Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403516300-32649-4-git-send-email-anarey@gmail.com \
--to=anarey@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).