diff options
author | Varsha Rao <rvarsha016@gmail.com> | 2017-09-20 21:53:08 +0530 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-09-27 14:00:13 +0200 |
commit | 676ea569bbe5abf750d9ed516f35c017efbdce5f (patch) | |
tree | c348c3f834009ef5edb881311b20f26a46b40307 /src/expr/immediate.c | |
parent | b808caea50a9de10530591b2e83c243d9fbf4855 (diff) |
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 <rvarsha016@gmail.com>
Diffstat (limited to 'src/expr/immediate.c')
-rw-r--r-- | src/expr/immediate.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 0b188cc..b0570bd 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -233,26 +233,26 @@ nftnl_expr_immediate_snprintf_default(char *buf, size_t len, const struct nftnl_expr *e, uint32_t flags) { - int size = len, offset = 0, ret; + int remain = len, offset = 0, ret; struct nftnl_expr_immediate *imm = nftnl_expr_data(e); - ret = snprintf(buf, len, "reg %u ", imm->dreg); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + ret = snprintf(buf, remain, "reg %u ", imm->dreg); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); if (e->flags & (1 << NFTNL_EXPR_IMM_DATA)) { - ret = nftnl_data_reg_snprintf(buf+offset, len, &imm->data, + ret = nftnl_data_reg_snprintf(buf + offset, remain, &imm->data, NFTNL_OUTPUT_DEFAULT, flags, DATA_VALUE); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } else if (e->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) { - ret = nftnl_data_reg_snprintf(buf+offset, len, &imm->data, + ret = nftnl_data_reg_snprintf(buf + offset, remain, &imm->data, NFTNL_OUTPUT_DEFAULT, flags, DATA_VERDICT); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } else if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) { - ret = nftnl_data_reg_snprintf(buf+offset, len, &imm->data, + ret = nftnl_data_reg_snprintf(buf + offset, remain, &imm->data, NFTNL_OUTPUT_DEFAULT, flags, DATA_CHAIN); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } return offset; |