From 960c8e6174374ee113b290c304365bf02ed346d6 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Tue, 9 Mar 2021 11:26:47 +0100
Subject: Drop pointless local variable in snprintf callbacks

A common idiom among snprintf callbacks was to copy the unsigned
parameter 'size' (or 'len') into a signed variable for further use.
Though since snprintf() itself casts it to unsigned and
SNPRINTF_BUFFER_SIZE() does not allow it to become negative, this is not
needed. Drop the local variable and rename the parameter accordingly.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/expr/bitwise.c      | 8 ++++----
 src/expr/byteorder.c    | 4 ++--
 src/expr/cmp.c          | 4 ++--
 src/expr/ct.c           | 4 ++--
 src/expr/data_reg.c     | 4 ++--
 src/expr/dup.c          | 4 ++--
 src/expr/dynset.c       | 4 ++--
 src/expr/fib.c          | 4 ++--
 src/expr/flow_offload.c | 4 ++--
 src/expr/fwd.c          | 4 ++--
 src/expr/hash.c         | 4 ++--
 src/expr/immediate.c    | 4 ++--
 src/expr/log.c          | 4 ++--
 src/expr/lookup.c       | 4 ++--
 src/expr/masq.c         | 4 ++--
 src/expr/nat.c          | 4 ++--
 src/expr/numgen.c       | 4 ++--
 src/expr/osf.c          | 4 ++--
 src/expr/queue.c        | 4 ++--
 src/expr/range.c        | 4 ++--
 src/expr/redir.c        | 4 ++--
 src/expr/synproxy.c     | 4 ++--
 src/expr/tproxy.c       | 4 ++--
 src/expr/xfrm.c         | 4 ++--
 24 files changed, 50 insertions(+), 50 deletions(-)

(limited to 'src/expr')

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 1d46a97..d0c7827 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -210,10 +210,10 @@ nftnl_expr_bitwise_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size,
+nftnl_expr_bitwise_snprintf_bool(char *buf, size_t remain,
 				 const struct nftnl_expr_bitwise *bitwise)
 {
-	int remain = size, offset = 0, ret;
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "reg %u = ( reg %u & ",
 		       bitwise->dreg, bitwise->sreg);
@@ -234,9 +234,9 @@ nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size,
 }
 
 static int
-nftnl_expr_bitwise_snprintf_shift(char *buf, size_t size, const char *op,
+nftnl_expr_bitwise_snprintf_shift(char *buf, size_t remain, const char *op,
 				  const struct nftnl_expr_bitwise *bitwise)
-{	int remain = size, offset = 0, ret;
+{	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "reg %u = ( reg %u %s ",
 		       bitwise->dreg, bitwise->sreg, op);
diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 9718b8f..d299745 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -198,11 +198,11 @@ static inline int nftnl_str2ntoh(const char *op)
 }
 
 static int
-nftnl_expr_byteorder_snprintf(char *buf, size_t size,
+nftnl_expr_byteorder_snprintf(char *buf, size_t remain,
 			      uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_byteorder *byteorder = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret;
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "reg %u = %s(reg %u, %u, %u) ",
 		       byteorder->dreg, bo2str(byteorder->op),
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 04b9f25..6030693 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -177,11 +177,11 @@ static inline int nftnl_str2cmp(const char *op)
 }
 
 static int
-nftnl_expr_cmp_snprintf(char *buf, size_t size,
+nftnl_expr_cmp_snprintf(char *buf, size_t remain,
 			uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_cmp *cmp = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret;
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "%s reg %u ",
 		       cmp2str(cmp->op), cmp->sreg);
diff --git a/src/expr/ct.c b/src/expr/ct.c
index f4a7dc6..d5dfc81 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -223,11 +223,11 @@ static inline int str2ctdir(const char *str, uint8_t *ctdir)
 }
 
 static int
-nftnl_expr_ct_snprintf(char *buf, size_t size,
+nftnl_expr_ct_snprintf(char *buf, size_t remain,
 		       uint32_t flags, const struct nftnl_expr *e)
 {
-	int ret, remain = size, offset = 0;
 	struct nftnl_expr_ct *ct = nftnl_expr_data(e);
+	int ret, offset = 0;
 
 	if (e->flags & (1 << NFTNL_EXPR_CT_SREG)) {
 		ret = snprintf(buf, remain, "set %s with reg %u ",
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index bafdc6f..2633a77 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -25,12 +25,12 @@
 #include "internal.h"
 
 static int
-nftnl_data_reg_value_snprintf_default(char *buf, size_t size,
+nftnl_data_reg_value_snprintf_default(char *buf, size_t remain,
 				      const union nftnl_data_reg *reg,
 				      uint32_t flags)
 {
 	const char *pfx = flags & DATA_F_NOPFX ? "" : "0x";
-	int remain = size, offset = 0, ret, i;
+	int offset = 0, ret, i;
 
 
 
diff --git a/src/expr/dup.c b/src/expr/dup.c
index 3eb560a..f041b55 100644
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -111,11 +111,11 @@ static int nftnl_expr_dup_parse(struct nftnl_expr *e, struct nlattr *attr)
 	return ret;
 }
 
-static int nftnl_expr_dup_snprintf(char *buf, size_t len,
+static int nftnl_expr_dup_snprintf(char *buf, size_t remain,
 				   uint32_t flags, const struct nftnl_expr *e)
 {
-	int remain = len, offset = 0, ret;
 	struct nftnl_expr_dup *dup = nftnl_expr_data(e);
+	int offset = 0, ret;
 
 	if (e->flags & (1 << NFTNL_EXPR_DUP_SREG_ADDR)) {
 		ret = snprintf(buf + offset, remain, "sreg_addr %u ", dup->sreg_addr);
diff --git a/src/expr/dynset.c b/src/expr/dynset.c
index 2ddf69a..85d64bb 100644
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
@@ -308,12 +308,12 @@ static const char *op2str(enum nft_dynset_ops op)
 }
 
 static int
-nftnl_expr_dynset_snprintf(char *buf, size_t size,
+nftnl_expr_dynset_snprintf(char *buf, size_t remain,
 			   uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_dynset *dynset = nftnl_expr_data(e);
 	struct nftnl_expr *expr;
-	int remain = size, offset = 0, ret;
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "%s reg_key %u set %s ",
 		       op2str(dynset->op), dynset->sreg_key, dynset->set_name);
diff --git a/src/expr/fib.c b/src/expr/fib.c
index b0cbb3b..aaff52a 100644
--- a/src/expr/fib.c
+++ b/src/expr/fib.c
@@ -143,13 +143,13 @@ static const char *fib_type_str(enum nft_fib_result r)
 }
 
 static int
-nftnl_expr_fib_snprintf(char *buf, size_t size,
+nftnl_expr_fib_snprintf(char *buf, size_t remain,
 			 uint32_t printflags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_fib *fib = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret, i;
 	uint32_t flags = fib->flags & ~NFTA_FIB_F_PRESENT;
 	uint32_t present_flag = fib->flags & NFTA_FIB_F_PRESENT;
+	int offset = 0, ret, i;
 	static const struct {
 		int bit;
 		const char *name;
diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
index 1882691..a826202 100644
--- a/src/expr/flow_offload.c
+++ b/src/expr/flow_offload.c
@@ -92,11 +92,11 @@ static int nftnl_expr_flow_parse(struct nftnl_expr *e, struct nlattr *attr)
 	return ret;
 }
 
-static int nftnl_expr_flow_snprintf(char *buf, size_t size,
+static int nftnl_expr_flow_snprintf(char *buf, size_t remain,
 				    uint32_t flags, const struct nftnl_expr *e)
 {
-	int remain = size, offset = 0, ret;
 	struct nftnl_expr_flow *l = nftnl_expr_data(e);
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "flowtable %s ", l->table_name);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
diff --git a/src/expr/fwd.c b/src/expr/fwd.c
index 0322be8..82e5a41 100644
--- a/src/expr/fwd.c
+++ b/src/expr/fwd.c
@@ -125,11 +125,11 @@ static int nftnl_expr_fwd_parse(struct nftnl_expr *e, struct nlattr *attr)
 	return ret;
 }
 
-static int nftnl_expr_fwd_snprintf(char *buf, size_t len,
+static int nftnl_expr_fwd_snprintf(char *buf, size_t remain,
 				   uint32_t flags, const struct nftnl_expr *e)
 {
-	int remain = len, offset = 0, ret;
 	struct nftnl_expr_fwd *fwd = nftnl_expr_data(e);
+	int offset = 0, ret;
 
 	if (e->flags & (1 << NFTNL_EXPR_FWD_SREG_DEV)) {
 		ret = snprintf(buf + offset, remain, "sreg_dev %u ",
diff --git a/src/expr/hash.c b/src/expr/hash.c
index 86b5ca6..10b4a72 100644
--- a/src/expr/hash.c
+++ b/src/expr/hash.c
@@ -184,11 +184,11 @@ nftnl_expr_hash_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_hash_snprintf(char *buf, size_t size,
+nftnl_expr_hash_snprintf(char *buf, size_t remain,
 			 uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_hash *hash = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret;
+	int offset = 0, ret;
 
 	switch (hash->type) {
 	case NFT_HASH_SYM:
diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 241aad3..94b043c 100644
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -184,11 +184,11 @@ nftnl_expr_immediate_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_immediate_snprintf(char *buf, size_t len,
+nftnl_expr_immediate_snprintf(char *buf, size_t remain,
 			      uint32_t flags, const struct nftnl_expr *e)
 {
-	int remain = len, offset = 0, ret;
 	struct nftnl_expr_immediate *imm = nftnl_expr_data(e);
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "reg %u ", imm->dreg);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
diff --git a/src/expr/log.c b/src/expr/log.c
index d56fad5..86db548 100644
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -187,11 +187,11 @@ nftnl_expr_log_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_log_snprintf(char *buf, size_t size,
+nftnl_expr_log_snprintf(char *buf, size_t remain,
 			uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_log *log = nftnl_expr_data(e);
-	int ret, offset = 0, remain = size;
+	int ret, offset = 0;
 
 	if (e->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) {
 		ret = snprintf(buf, remain, "prefix %s ", log->prefix);
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index ec7f6fb..83adce9 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -168,11 +168,11 @@ nftnl_expr_lookup_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_lookup_snprintf(char *buf, size_t size,
+nftnl_expr_lookup_snprintf(char *buf, size_t remain,
 			   uint32_t flags, const struct nftnl_expr *e)
 {
-	int remain = size, offset = 0, ret;
 	struct nftnl_expr_lookup *l = nftnl_expr_data(e);
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "reg %u set %s ", l->sreg, l->set_name);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
diff --git a/src/expr/masq.c b/src/expr/masq.c
index 1f6dbdb..684708c 100644
--- a/src/expr/masq.c
+++ b/src/expr/masq.c
@@ -131,11 +131,11 @@ nftnl_expr_masq_parse(struct nftnl_expr *e, struct nlattr *attr)
 	return 0;
 }
 
-static int nftnl_expr_masq_snprintf(char *buf, size_t len,
+static int nftnl_expr_masq_snprintf(char *buf, size_t remain,
 				    uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_masq *masq = nftnl_expr_data(e);
-	int remain = len, offset = 0, ret = 0;
+	int offset = 0, ret = 0;
 
 	if (e->flags & (1 << NFTNL_EXPR_MASQ_REG_PROTO_MIN)) {
 		ret = snprintf(buf + offset, remain, "proto_min reg %u ",
diff --git a/src/expr/nat.c b/src/expr/nat.c
index 25d4e92..0a9cdd7 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -221,11 +221,11 @@ static inline int nftnl_str2nat(const char *nat)
 }
 
 static int
-nftnl_expr_nat_snprintf(char *buf, size_t size,
+nftnl_expr_nat_snprintf(char *buf, size_t remain,
 			uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_nat *nat = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret = 0;
+	int offset = 0, ret = 0;
 
 	ret = snprintf(buf, remain, "%s ", nat2str(nat->type));
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
diff --git a/src/expr/numgen.c b/src/expr/numgen.c
index 602e4c0..159dfec 100644
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
@@ -143,11 +143,11 @@ nftnl_expr_ng_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_ng_snprintf(char *buf, size_t size,
+nftnl_expr_ng_snprintf(char *buf, size_t remain,
 		       uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_ng *ng = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret;
+	int offset = 0, ret;
 
 	switch (ng->type) {
 	case NFT_NG_INCREMENTAL:
diff --git a/src/expr/osf.c b/src/expr/osf.c
index 56fc4e0..215a681 100644
--- a/src/expr/osf.c
+++ b/src/expr/osf.c
@@ -125,11 +125,11 @@ nftnl_expr_osf_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_osf_snprintf(char *buf, size_t size,
+nftnl_expr_osf_snprintf(char *buf, size_t len,
 			uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_osf *osf = nftnl_expr_data(e);
-	int ret, offset = 0, len = size;
+	int ret, offset = 0;
 
 	if (e->flags & (1 << NFTNL_EXPR_OSF_DREG)) {
 		ret = snprintf(buf, len, "dreg %u ", osf->dreg);
diff --git a/src/expr/queue.c b/src/expr/queue.c
index 0bab283..8f70977 100644
--- a/src/expr/queue.c
+++ b/src/expr/queue.c
@@ -144,12 +144,12 @@ nftnl_expr_queue_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_queue_snprintf(char *buf, size_t len,
+nftnl_expr_queue_snprintf(char *buf, size_t remain,
 			  uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_queue *queue = nftnl_expr_data(e);
-	int ret, remain = len, offset = 0;
 	uint16_t total_queues;
+	int ret, offset = 0;
 
 	if (e->flags & (1 << NFTNL_EXPR_QUEUE_NUM)) {
 		total_queues = queue->queuenum + queue->queues_total - 1;
diff --git a/src/expr/range.c b/src/expr/range.c
index eed4882..f76843a 100644
--- a/src/expr/range.c
+++ b/src/expr/range.c
@@ -184,11 +184,11 @@ static inline int nftnl_str2range(const char *op)
 	}
 }
 
-static int nftnl_expr_range_snprintf(char *buf, size_t size,
+static int nftnl_expr_range_snprintf(char *buf, size_t remain,
 				     uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_range *range = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret;
+	int offset = 0, ret;
 
 	ret = snprintf(buf, remain, "%s reg %u ",
 		       range2str(range->op), range->sreg);
diff --git a/src/expr/redir.c b/src/expr/redir.c
index 8de4c60..4f56cb4 100644
--- a/src/expr/redir.c
+++ b/src/expr/redir.c
@@ -132,10 +132,10 @@ nftnl_expr_redir_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_redir_snprintf(char *buf, size_t len,
+nftnl_expr_redir_snprintf(char *buf, size_t remain,
 			  uint32_t flags, const struct nftnl_expr *e)
 {
-	int ret, remain = len, offset = 0;
+	int ret, offset = 0;
 	struct nftnl_expr_redir *redir = nftnl_expr_data(e);
 
 	if (nftnl_expr_is_set(e, NFTNL_EXPR_REDIR_REG_PROTO_MIN)) {
diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c
index dc68b9d..630f3f4 100644
--- a/src/expr/synproxy.c
+++ b/src/expr/synproxy.c
@@ -128,11 +128,11 @@ nftnl_expr_synproxy_parse(struct nftnl_expr *e, struct nlattr *attr)
 }
 
 static int
-nftnl_expr_synproxy_snprintf(char *buf, size_t size,
+nftnl_expr_synproxy_snprintf(char *buf, size_t len,
 			     uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_synproxy *synproxy = nftnl_expr_data(e);
-	int ret, offset = 0, len = size;
+	int ret, offset = 0;
 
 	if (e->flags & (1 << NFTNL_EXPR_SYNPROXY_MSS) &&
 	    e->flags & (1 << NFTNL_EXPR_SYNPROXY_WSCALE)) {
diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c
index eeb1bee..d3ee8f8 100644
--- a/src/expr/tproxy.c
+++ b/src/expr/tproxy.c
@@ -135,11 +135,11 @@ nftnl_expr_tproxy_build(struct nlmsghdr *nlh, const struct nftnl_expr *e)
 }
 
 static int
-nftnl_expr_tproxy_snprintf(char *buf, size_t size,
+nftnl_expr_tproxy_snprintf(char *buf, size_t remain,
 			uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_tproxy *tproxy = nftnl_expr_data(e);
-	int remain = size, offset = 0, ret = 0;
+	int offset = 0, ret = 0;
 
 	if (tproxy->family != NFTA_TPROXY_UNSPEC) {
 		ret = snprintf(buf + offset, remain, "%s ",
diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
index d7586ce..c81d14d 100644
--- a/src/expr/xfrm.c
+++ b/src/expr/xfrm.c
@@ -172,11 +172,11 @@ static const char *xfrmdir2str(uint8_t dir)
 }
 
 static int
-nftnl_expr_xfrm_snprintf(char *buf, size_t size,
+nftnl_expr_xfrm_snprintf(char *buf, size_t remain,
 			 uint32_t flags, const struct nftnl_expr *e)
 {
 	struct nftnl_expr_xfrm *x = nftnl_expr_data(e);
-	int ret, remain = size, offset = 0;
+	int ret, offset = 0;
 
 	if (e->flags & (1 << NFTNL_EXPR_XFRM_DREG)) {
 		ret = snprintf(buf, remain, "load %s %u %s => reg %u ",
-- 
cgit v1.2.3