summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2017-10-04 13:58:53 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2017-10-04 14:17:24 +0200
commit2c8e01c555a488f32c9648a1b8ee7b6ed1c3e194 (patch)
tree2c51cfaf055ed34a3166082f664b7e29c33b57ad
parent750fbea1a1b58d383707ce121e1140dbc5a8ee58 (diff)
src: no need to nul-terminate buffer for nftnl_fprintf() calls
This function bails out with -1 if we cannot print, and this buffer is internally allocated. No need for this overly deffensive initialization. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/chain.c3
-rw-r--r--src/common.c6
-rw-r--r--src/gen.c3
-rw-r--r--src/object.c3
-rw-r--r--src/rule.c3
-rw-r--r--src/set.c3
-rw-r--r--src/set_elem.c3
-rw-r--r--src/table.c3
8 files changed, 0 insertions, 27 deletions
diff --git a/src/chain.c b/src/chain.c
index 6df871d..5e30a80 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -867,9 +867,6 @@ EXPORT_SYMBOL(nftnl_chain_snprintf);
static int nftnl_chain_do_snprintf(char *buf, size_t size, const void *c,
uint32_t cmd, uint32_t type, uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
return nftnl_chain_snprintf(buf, size, c, type, flags);
}
diff --git a/src/common.c b/src/common.c
index ba5a49f..a95883c 100644
--- a/src/common.c
+++ b/src/common.c
@@ -94,9 +94,6 @@ EXPORT_SYMBOL(nftnl_parse_perror);
int nftnl_cmd_header_snprintf(char *buf, size_t size, uint32_t cmd, uint32_t type,
uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
NFTNL_BUF_INIT(b, buf, size);
if (cmd == NFTNL_CMD_UNSPEC)
@@ -138,9 +135,6 @@ int nftnl_cmd_header_fprintf(FILE *fp, uint32_t cmd, uint32_t type,
int nftnl_cmd_footer_snprintf(char *buf, size_t size, uint32_t cmd, uint32_t type,
uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
NFTNL_BUF_INIT(b, buf, size);
if (cmd == NFTNL_CMD_UNSPEC)
diff --git a/src/gen.c b/src/gen.c
index a03648b..e42dd40 100644
--- a/src/gen.c
+++ b/src/gen.c
@@ -203,9 +203,6 @@ EXPORT_SYMBOL(nftnl_gen_snprintf);
static int nftnl_gen_do_snprintf(char *buf, size_t size, const void *gen,
uint32_t cmd, uint32_t type, uint32_t flags)
{
- if (size)
- buf = '\0';
-
return nftnl_gen_snprintf(buf, size, gen, type, flags);
}
diff --git a/src/object.c b/src/object.c
index 8dc83b3..f907dd2 100644
--- a/src/object.c
+++ b/src/object.c
@@ -488,9 +488,6 @@ EXPORT_SYMBOL(nftnl_obj_snprintf);
static int nftnl_obj_do_snprintf(char *buf, size_t size, const void *obj,
uint32_t cmd, uint32_t type, uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
return nftnl_obj_snprintf(buf, size, obj, type, flags);
}
diff --git a/src/rule.c b/src/rule.c
index f37806c..7cbd15b 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -836,9 +836,6 @@ EXPORT_SYMBOL(nftnl_rule_snprintf);
static int nftnl_rule_do_snprintf(char *buf, size_t size, const void *r,
uint32_t cmd, uint32_t type, uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
return nftnl_rule_snprintf(buf, size, r, type, flags);
}
diff --git a/src/set.c b/src/set.c
index a4e41d2..36e59c3 100644
--- a/src/set.c
+++ b/src/set.c
@@ -939,9 +939,6 @@ EXPORT_SYMBOL(nftnl_set_snprintf);
static int nftnl_set_do_snprintf(char *buf, size_t size, const void *s,
uint32_t cmd, uint32_t type, uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
return nftnl_set_snprintf(buf, size, s, type, flags);
}
diff --git a/src/set_elem.c b/src/set_elem.c
index a8f88a4..a99876a 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -738,9 +738,6 @@ static int nftnl_set_elem_do_snprintf(char *buf, size_t size, const void *e,
uint32_t cmd, uint32_t type,
uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
return nftnl_set_elem_snprintf(buf, size, e, type, flags);
}
diff --git a/src/table.c b/src/table.c
index 4d8176c..db870cd 100644
--- a/src/table.c
+++ b/src/table.c
@@ -417,9 +417,6 @@ EXPORT_SYMBOL(nftnl_table_snprintf);
static int nftnl_table_do_snprintf(char *buf, size_t size, const void *t,
uint32_t cmd, uint32_t type, uint32_t flags)
{
- if (size)
- buf[0] = '\0';
-
return nftnl_table_snprintf(buf, size, t, type, flags);
}