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/fib.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/fib.c')
| -rw-r--r-- | src/expr/fib.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/expr/fib.c b/src/expr/fib.c index f3be081..b922b26 100644 --- a/src/expr/fib.c +++ b/src/expr/fib.c @@ -172,7 +172,7 @@ nftnl_expr_fib_snprintf_default(char *buf, size_t size, const struct nftnl_expr *e) { struct nftnl_expr_fib *fib = nftnl_expr_data(e); - int len = size, offset = 0, ret, i; + 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; static const struct { @@ -188,27 +188,29 @@ nftnl_expr_fib_snprintf_default(char *buf, size_t size, for (i = 0; i < (sizeof(tab) / sizeof(tab[0])); i++) { if (flags & tab[i].bit) { - ret = snprintf(buf + offset, len, "%s ", tab[i].name); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + ret = snprintf(buf + offset, remain, "%s ", + tab[i].name); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); flags &= ~tab[i].bit; if (flags) { - ret = snprintf(buf + offset, len, ". "); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + ret = snprintf(buf + offset, remain, ". "); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } } } if (flags) { - ret = snprintf(buf + offset, len, "unknown 0x%" PRIx32, flags); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + ret = snprintf(buf + offset, remain, "unknown 0x%" PRIx32, + flags); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); } - ret = snprintf(buf + offset, len, "%s%s => reg %d ", + ret = snprintf(buf + offset, remain, "%s%s => reg %d ", fib_type_str(fib->result), present_flag ? " present" : "", fib->dreg); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); return offset; } |