From 676ea569bbe5abf750d9ed516f35c017efbdce5f Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Wed, 20 Sep 2017 21:53:08 +0530 Subject: src: Change parameters of SNPRINTF_BUFFER_SIZE macro. SNPRINTF_BUFFER_SIZE() macro declaration and definition is changed so that it accepts three arguments ret, remain and offset. Parameters size and len are not required instead parameter remain keeps track of available space in the buffer. Signed-off-by: Varsha Rao --- src/expr/nat.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/expr/nat.c') diff --git a/src/expr/nat.c b/src/expr/nat.c index 29bc3a2..9271303 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -304,31 +304,32 @@ nftnl_expr_nat_snprintf_default(char *buf, size_t size, const struct nftnl_expr *e) { struct nftnl_expr_nat *nat = nftnl_expr_data(e); - int len = size, offset = 0, ret = 0; + int remain = size, offset = 0, ret = 0; - ret = snprintf(buf, len, "%s ", nat2str(nat->type)); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + ret = snprintf(buf, remain, "%s ", nat2str(nat->type)); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); - ret = snprintf(buf+offset, len, "%s ", nftnl_family2str(nat->family)); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + ret = snprintf(buf + offset, remain, "%s ", + nftnl_family2str(nat->family)); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); if (e->flags & (1 << NFTNL_EXPR_NAT_REG_ADDR_MIN)) { - ret = snprintf(buf+offset, len, + ret = snprintf(buf + offset, remain, "addr_min reg %u addr_max reg %u ", nat->sreg_addr_min, nat->sreg_addr_max); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } if (e->flags & (1 << NFTNL_EXPR_NAT_REG_PROTO_MIN)) { - ret = snprintf(buf+offset, len, + ret = snprintf(buf + offset, remain, "proto_min reg %u proto_max reg %u ", nat->sreg_proto_min, nat->sreg_proto_max); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } if (e->flags & (1 << NFTNL_EXPR_NAT_FLAGS)) { - ret = snprintf(buf+offset, len, "flags %u", nat->flags); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + ret = snprintf(buf + offset, remain, "flags %u", nat->flags); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } return offset; -- cgit v1.2.3