From ec4b60bebcab23d46aa09bed06018457c35e5afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Neira=20Ayuso?= Date: Sun, 13 Oct 2013 21:52:34 +0200 Subject: src: json: remove spaces Remove all the spaces from the JSON output to reduce the size of the output string, this also provides a consistent output in table, chain, rule and set. As Stephen Hemminger suggested, better to squash the output to consume as less bytes as possible. Signed-off-by: Alvaro Neira Ayuso Signed-off-by: Pablo Neira Ayuso --- src/expr/nat.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/expr/nat.c') diff --git a/src/expr/nat.c b/src/expr/nat.c index 3c40b93..7150eec 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -327,28 +327,26 @@ nft_rule_expr_nat_snprintf_json(char *buf, size_t size, int len = size, offset = 0, ret = 0; if (nat->type == NFT_NAT_SNAT) - ret = snprintf(buf, len, "\"nat_type\" : \"snat\", "); + ret = snprintf(buf, len, "\"nat_type\":\"snat\","); else if (nat->type == NFT_NAT_DNAT) - ret = snprintf(buf, len, "\"nat_type\" : \"dnat\", "); + ret = snprintf(buf, len, "\"nat_type\":\"dnat\","); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, len, "\"family\" : \"%s\", ", + ret = snprintf(buf+offset, len, "\"family\":\"%s\",", nft_family2str(nat->family)); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); if (e->flags & (1 << NFT_EXPR_NAT_REG_ADDR_MIN)) { - ret = snprintf(buf+offset, len, - "\"sreg_addr_min\" : %u, " - "\"sreg_addr_max\" : %u, ", + ret = snprintf(buf+offset, len, "\"sreg_addr_min\":%u," + "\"sreg_addr_max\":%u,", nat->sreg_addr_min, nat->sreg_addr_max); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } if (e->flags & (1 << NFT_EXPR_NAT_REG_PROTO_MIN)) { - ret = snprintf(buf+offset, len, - "\"sreg_proto_min\" : %u, " - "\"sreg_proto_max\" : %u", + ret = snprintf(buf+offset, len, "\"sreg_proto_min\":%u," + "\"sreg_proto_max\":%u", nat->sreg_proto_min, nat->sreg_proto_max); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } -- cgit v1.2.3