diff options
author | Phil Sutter <phil@nwl.cc> | 2021-03-09 11:26:47 +0100 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2021-03-15 12:23:20 +0100 |
commit | 960c8e6174374ee113b290c304365bf02ed346d6 (patch) | |
tree | 3c5b27821e29409822920e6113e1c3364ac5b4e9 /src/set.c | |
parent | 4f6e671b462180ba9af12bd30211811b5fca8cb1 (diff) |
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>
Diffstat (limited to 'src/set.c')
-rw-r--r-- | src/set.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -784,13 +784,12 @@ int nftnl_set_parse_file(struct nftnl_set *s, enum nftnl_parse_type type, return nftnl_set_do_parse(s, type, fp, err, NFTNL_PARSE_FILE); } -static int nftnl_set_snprintf_default(char *buf, size_t size, +static int nftnl_set_snprintf_default(char *buf, size_t remain, const struct nftnl_set *s, uint32_t type, uint32_t flags) { - int ret; - int remain = size, offset = 0; struct nftnl_set_elem *elem; + int ret, offset = 0; ret = snprintf(buf, remain, "%s %s %x", s->name, s->table, s->set_flags); @@ -837,12 +836,12 @@ static int nftnl_set_snprintf_default(char *buf, size_t size, return offset; } -static int nftnl_set_cmd_snprintf(char *buf, size_t size, +static int nftnl_set_cmd_snprintf(char *buf, size_t remain, const struct nftnl_set *s, uint32_t cmd, uint32_t type, uint32_t flags) { - int ret, remain = size, offset = 0; uint32_t inner_flags = flags; + int ret, offset = 0; if (type == NFTNL_OUTPUT_XML) return 0; |