src: remove trailing newlines, tabs and spaces from XML format

Delete all \n and \t from XML output, any reasonable XML viewer
already does the nifty formatting for us.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/chain.c b/src/chain.c
index 9d7717927557f8dd2e7b6db58876289b2fb03179..c06e5526182db49341b72b648f2d737bf7c3f325 100644 (file)
--- a/src/chain.c
+++ b/src/chain.c
@@ -450,18 +450,18 @@ static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c)
 {
        return snprintf(buf, size,
                "<chain name=\"%s\" handle=\"%lu\""
-                       " bytes=\"%lu\" packets=\"%lu\" >\n"
-                       "\t<properties>\n"
-                               "\t\t<flags>%d</flags>\n"
-                               "\t\t<type>%s</type>\n"
-                               "\t\t<table>%s</table>\n"
-                               "\t\t<prio>%d</prio>\n"
-                               "\t\t<use>%d</use>\n"
-                               "\t\t<hooknum>%d</hooknum>\n"
-                               "\t\t<policy>%d</policy>\n"
-                               "\t\t<family>%d</family>\n"
-                       "\t</properties>\n"
-               "</chain>\n",
+                       " bytes=\"%lu\" packets=\"%lu\">"
+                       "<properties>"
+                               "<flags>%d</flags>"
+                               "<type>%s</type>"
+                               "<table>%s</table>"
+                               "<prio>%d</prio>"
+                               "<use>%d</use>"
+                               "<hooknum>%d</hooknum>"
+                               "<policy>%d</policy>"
+                               "<family>%d</family>"
+                       "</properties>"
+               "</chain>",
                        c->name, c->handle, c->bytes, c->packets,
                        c->flags, c->type, c->table, c->prio,
                        c->use, c->hooknum, c->policy, c->family);

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 052144e7206acf60efe45450916eae38fdd1fb0f..ddcf6a73d3593e96037528a63cedf9b996569df3 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -201,8 +201,8 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size,
 {
        int len = size, offset = 0, ret;
 
-       ret = snprintf(buf, len, "\t\t<sreg>%u</sreg> "
-                                       "<dreg>%u</dreg> ",
+       ret = snprintf(buf, len, "<sreg>%u</sreg>"
+                               "<dreg>%u</dreg>",
                       bitwise->sreg, bitwise->dreg);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
@@ -213,14 +213,14 @@ nft_rule_expr_bitwise_snprintf_xml(char *buf, size_t size,
                                    NFT_RULE_O_XML, 0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
-       ret = snprintf(buf+offset, len, "</mask> <xor>");
+       ret = snprintf(buf+offset, len, "</mask><xor>");
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        ret = nft_data_reg_snprintf(buf+offset, len, &bitwise->xor,
                                    NFT_RULE_O_XML, 0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
-       ret = snprintf(buf+offset, len, "</xor> ");
+       ret = snprintf(buf+offset, len, "</xor>");
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        return offset;

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 6b5a3a2160c9bf4b5ff2f1aa2e695a529994acc3..3de849aa8df82e7b0cd6b8e5ce8c8df4320b959e 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -171,7 +171,7 @@ nft_rule_expr_cmp_snprintf_xml(char *buf, size_t size, struct nft_expr_cmp *cmp)
 {
        int len = size, offset = 0, ret;
 
-       ret = snprintf(buf, len, "\t\t<sreg>%u</sreg> <op>%s</op> <cmpdata>",
+       ret = snprintf(buf, len, "<sreg>%u</sreg><op>%s</op><cmpdata>",
                       cmp->sreg, expr_cmp_str[cmp->op]);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
@@ -179,7 +179,7 @@ nft_rule_expr_cmp_snprintf_xml(char *buf, size_t size, struct nft_expr_cmp *cmp)
                                    NFT_RULE_O_XML, 0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
-       ret = snprintf(buf+offset, len, "</cmpdata> ");
+       ret = snprintf(buf+offset, len, "</cmpdata>");
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        return offset;

diff --git a/src/expr/counter.c b/src/expr/counter.c
index d2da9bfc992017ea1cef89ff2a68fccc8a885de4..550d56dd77e0262caeac3d496c184111f691eb5c 100644 (file)
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -133,7 +133,7 @@ nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type,
 
        switch(type) {
        case NFT_RULE_O_XML:
-               return snprintf(buf, len, "\t\t<pkts>%lu</pkts> <bytes>%lu</bytes> ",
+               return snprintf(buf, len, "<pkts>%lu</pkts><bytes>%lu</bytes>",
                                ctr->pkts, ctr->bytes);
        case NFT_RULE_O_DEFAULT:
                return snprintf(buf, len, "pkts=%lu bytes=%lu ",

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 082db76955a729f510005e8a51c36b7754a082ea..10f7793d0a8bf9fca4596913966aa0311fade6d1 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -202,8 +202,8 @@ nft_rule_expr_immediate_snprintf_xml(char *buf, size_t len,
        int size = len, offset = 0, ret;
        struct nft_expr_immediate *imm = (struct nft_expr_immediate *)e->data;
 
-       ret = snprintf(buf, len, "\t\t<dreg>%u</dreg>"
-                               "\n\t\t<immediatedata>", imm->dreg);
+       ret = snprintf(buf, len, "<dreg>%u</dreg>"
+                               "<immediatedata>", imm->dreg);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
 

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 550c850f282217afc403c2f992c3d4d26374fff6..003554b9b39cf246ca78d8471055656365158f51 100644 (file)
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -156,7 +156,7 @@ nft_rule_expr_lookup_snprintf_xml(char *buf, size_t size,
 {
        int len = size, offset = 0, ret;
 
-       ret = snprintf(buf, len, "<set>%s</set><sreg>%u</sreg><dreg>%u</dreg>\n",
+       ret = snprintf(buf, len, "<set>%s</set><sreg>%u</sreg><dreg>%u</dreg>",
                        l->set_name, l->sreg, l->dreg);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 

diff --git a/src/expr/match.c b/src/expr/match.c
index f83a8eaf65ef2f57f7decd89c0bcfb62def4096c..57c5ab908a160751f24e503ebbcb311486b068d3 100644 (file)
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -184,16 +184,15 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *att
        return 0;
 }
 
-static
-int nft_rule_expr_match_snprintf_xml(char *buf, size_t len,
-                               struct nft_expr_match *mt)
+static int nft_rule_expr_match_snprintf_xml(char *buf, size_t len,
+                                           struct nft_expr_match *mt)
 {
        int ret, size=len;
        int i;
        int offset = 0;
        uint8_t *data = (uint8_t *)mt->data;
 
-       ret = snprintf(buf, len, "\t\t<name>%s</name> <rev>%u</rev> <info>0x",
+       ret = snprintf(buf, len, "<name>%s</name><rev>%u</rev><info>0x",
                                mt->name, mt->rev);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
@@ -202,7 +201,7 @@ int nft_rule_expr_match_snprintf_xml(char *buf, size_t len,
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
        }
 
-       ret = snprintf(buf+offset, len, "</info>" );
+       ret = snprintf(buf+offset, len, "</info>");
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        return offset;

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 2095545298e9429520fe4ec4387a08c8df6dc230..bfc1aa6b3a0d982d1e404c15e62bb9ff7aaa1050 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -133,8 +133,8 @@ nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type,
 
        switch(type) {
        case NFT_RULE_O_XML:
-               return snprintf(buf, len, "\t\t<dreg>%u</dreg>"
-                                         " <key>%u</key> ",
+               return snprintf(buf, len, "<dreg>%u</dreg>"
+                                         "<key>%u</key>",
                                meta->dreg, meta->key);
        case NFT_RULE_O_DEFAULT:
                return snprintf(buf, len, "dreg=%u key=%u ",

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 68217bda0164ec19516d641cbe4f9dfb8675eb91..56212a73faced989bd4d0594fd7808ce6fdafd95 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -211,17 +211,17 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,
        switch (nat->type) {
        case NFT_NAT_SNAT:
                ret = snprintf(buf, len,
-                       "\t\t<type>NFT_NAT_SNAT</type> ");
+                       "<type>NFT_NAT_SNAT</type>");
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
                break;
        case NFT_NAT_DNAT:
                ret = snprintf(buf, len,
-                       "\t\t<type>NFT_NAT_DNAT</type> ");
+                       "<type>NFT_NAT_DNAT</type>");
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
                break;
        }
 
-       ret = snprintf(buf, len, "<family>%s</family> ",
+       ret = snprintf(buf, len, "<family>%s</family>",
                       nat->family == AF_INET ? "AF_INET" : "AF_INET6");
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
@@ -234,7 +234,7 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,
 
        if (e->flags & (1 << NFT_EXPR_NAT_REG_PROTO_MIN)) {
                ret = snprintf(buf, len, "<sreg_proto_min>%u</sreg_proto_min>"
-                               " <sreg_proto_max>%u</sreg_proto_max> ",
+                               "<sreg_proto_max>%u</sreg_proto_max>",
                       nat->sreg_proto_min, nat->sreg_proto_max);
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
        }

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 33fcef1cf65c23fd371423faacbba1a275d011cd..091078b23c37c6e56ec52b0b4c71e4d7690126d6 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -172,8 +172,8 @@ nft_rule_expr_payload_snprintf(char *buf, size_t len, uint32_t type,
 
        switch(type) {
        case NFT_RULE_O_XML:
-               return snprintf(buf, len, "\t\t<dreg>%u</dreg>"
-                                         "<base>%u</base> <offset>%u</offset>"
+               return snprintf(buf, len, "<dreg>%u</dreg>"
+                                         "<base>%u</base><offset>%u</offset>"
                                          "<len>%u</len>",
                                payload->dreg, payload->base,
                                        payload->offset, payload->len);

diff --git a/src/expr/target.c b/src/expr/target.c
index 86c9bc87ccd435a9d003f08af87dbde9bba4e4f2..d3de8e85d286217f7a5488604ea41f20243ba8c1 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -193,7 +193,7 @@ int nft_rule_exp_target_snprintf_xml(char *buf, size_t len,
        int offset = 0;
        uint8_t *data = (uint8_t *)tg->data;
 
-       ret = snprintf(buf, len, "\t\t<name>%s</name> <rev>%u</rev> <info>0x",
+       ret = snprintf(buf, len, "<name>%s</name><rev>%u</rev><info>0x",
                        tg->name, tg->rev);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
@@ -202,7 +202,7 @@ int nft_rule_exp_target_snprintf_xml(char *buf, size_t len,
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
        }
 
-       ret = snprintf(buf+offset, len, "</info>" );
+       ret = snprintf(buf+offset, len, "</info>");
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        return offset;

diff --git a/src/rule.c b/src/rule.c
index 534526c4d94797a8b700397e5c68e9e79952e8cb..849cb4132089de914fc1db2f7dbbcba0bd95c172 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -459,17 +459,17 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,
 
        list_for_each_entry(expr, &r->expr_list, head) {
                ret = snprintf(buf+offset, len,
-                               "\n\t<expr type=\"%s\">\n", expr->ops->name);
+                               "<expr type=\"%s\">", expr->ops->name);
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
                ret = expr->ops->snprintf(buf+offset, len, type, flags, expr);
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
-               ret = snprintf(buf+offset, len, "\n\t</expr>");
+               ret = snprintf(buf+offset, len, "</expr>");
                SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        }
-       ret = snprintf(buf+offset, len, "\n</rule>\n ");
+       ret = snprintf(buf+offset, len, "</rule>");
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        return ret;

diff --git a/src/table.c b/src/table.c
index 33fb26c5b7b6add4bffc602934d912e1b0871e46..c963e6e9f01608021d4da28e2d25e8ecd4980ecf 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -185,13 +185,13 @@ EXPORT_SYMBOL(nft_table_nlmsg_parse);
 static int nft_table_snprintf_xml(char *buf, size_t size, struct nft_table *t)
 {
        return snprintf(buf, size,
-                       "<table name=\"%s\" >\n"
-                               "\t<properties>\n"
-                                       "\t\t<family>%u</family>\n"
-                                       "\t\t<flags>%d</flags>\n"
-                                       "\t\t<table_flags>%d</table_flags>\n"
-                               "\t</properties>\n"
-                       "</table>\n" ,
+                       "<table name=\"%s\">"
+                               "<properties>"
+                                       "<family>%u</family>"
+                                       "<flags>%d</flags>"
+                                       "<table_flags>%d</table_flags>"
+                               "</properties>"
+                       "</table>" ,
                        t->name, t->family, t->flags, t->table_flags);
 }