From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Subject: [libnftables PATCH 1/2] set_elem: xml: avoid code duplication
Date: Thu, 26 Sep 2013 00:13:02 +0200 [thread overview]
Message-ID: <20130925221302.16997.17406.stgit@nfdev.cica.es> (raw)
This patch removes 3x code duplication in the XML snprintf function.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
src/set_elem.c | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/set_elem.c b/src/set_elem.c
index a9e0751..885893b 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -519,7 +519,7 @@ static int nft_set_elem_snprintf_default(char *buf, size_t size,
static int nft_set_elem_snprintf_xml(char *buf, size_t size,
struct nft_set_elem *e, uint32_t flags)
{
- int ret, len = size, offset = 0;
+ int ret, len = size, offset = 0, type = DATA_NONE;
ret = snprintf(buf, size, "<set_elem>"
"<flags>%u</flags><key>",
@@ -533,33 +533,19 @@ static int nft_set_elem_snprintf_xml(char *buf, size_t size,
ret = snprintf(buf+offset, size, "</key>");
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- if (e->flags & (1 << NFT_SET_ELEM_ATTR_DATA)) {
- ret = snprintf(buf+offset, size, "<data>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
- ret = nft_data_reg_snprintf(buf+offset, len, &e->data,
- NFT_RULE_O_XML, flags, DATA_VALUE);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
- ret = snprintf(buf+offset, size, "</data>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- } else if (e->flags & (1 << NFT_SET_ELEM_ATTR_VERDICT)) {
- ret = snprintf(buf+offset, size, "<data>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
- ret = nft_data_reg_snprintf(buf+offset, len, &e->data,
- NFT_RULE_O_XML, flags,
- DATA_VERDICT);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
+ if (e->flags & (1 << NFT_SET_ELEM_ATTR_DATA))
+ type = DATA_VALUE;
+ else if (e->flags & (1 << NFT_SET_ELEM_ATTR_CHAIN))
+ type = DATA_CHAIN;
+ else if (e->flags & (1 << NFT_SET_ELEM_ATTR_VERDICT))
+ type = DATA_VERDICT;
- ret = snprintf(buf+offset, size, "</data>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- } else if (e->flags & (1 << NFT_SET_ELEM_ATTR_CHAIN)) {
+ if (type != DATA_NONE) {
ret = snprintf(buf+offset, size, "<data>");
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
ret = nft_data_reg_snprintf(buf+offset, len, &e->data,
- NFT_RULE_O_XML, flags, DATA_CHAIN);
+ NFT_RULE_O_XML, flags, type);
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
ret = snprintf(buf+offset, size, "</data>");
next reply other threads:[~2013-09-25 22:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-25 22:13 Arturo Borrero Gonzalez [this message]
2013-09-25 22:13 ` [libnftables PATCH 2/2] src: snprintf: fix buffer lengths Arturo Borrero Gonzalez
2013-09-27 14:06 ` Pablo Neira Ayuso
2013-09-27 14:05 ` [libnftables PATCH 1/2] set_elem: xml: avoid code duplication 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=20130925221302.16997.17406.stgit@nfdev.cica.es \
--to=arturo.borrero.glez@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).