From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 4 Oct 2017 12:11:43 +0000 (+0200)
Subject: src: do not nul-terminate internal helper functions
X-Git-Tag: libnftnl-1.0.8~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca4009ab178cfa07a989ef9bbc89ee6f3caf1b93;p=thirdparty%2Flibnftnl.git

src: do not nul-terminate internal helper functions

Public API already does this for us, no need to do this again from
internal helper functions.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/chain.c b/src/chain.c
index 5e30a801..a11bcf5c 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -827,9 +827,6 @@ static int nftnl_chain_cmd_snprintf(char *buf, size_t size,
 {
 	int ret, remain = size, offset = 0;
 
-	if (size)
-		buf[0] = '\0';
-
 	ret = nftnl_cmd_header_snprintf(buf + offset, remain, cmd, type, flags);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index c925e201..a246952f 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -194,9 +194,6 @@ int nftnl_data_reg_snprintf(char *buf, size_t size,
 			    uint32_t output_format, uint32_t flags,
 			    int reg_type)
 {
-	if (size)
-		buf[0] = '\0';
-
 	switch(reg_type) {
 	case DATA_VALUE:
 		switch(output_format) {
diff --git a/src/gen.c b/src/gen.c
index e42dd405..58b3a96d 100644
--- a/src/gen.c
+++ b/src/gen.c
@@ -168,9 +168,6 @@ static int nftnl_gen_cmd_snprintf(char *buf, size_t size,
 {
 	int ret, remain = size, offset = 0;
 
-	if (size)
-		buf[0] = '\0';
-
 	ret = nftnl_cmd_header_snprintf(buf + offset, remain, cmd, type, flags);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
diff --git a/src/object.c b/src/object.c
index f907dd22..9a4ee712 100644
--- a/src/object.c
+++ b/src/object.c
@@ -448,9 +448,6 @@ static int nftnl_obj_cmd_snprintf(char *buf, size_t size,
 {
 	int ret, remain = size, offset = 0;
 
-	if (size)
-		buf[0] = '\0';
-
 	ret = nftnl_cmd_header_snprintf(buf + offset, remain, cmd, type, flags);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
diff --git a/src/rule.c b/src/rule.c
index 7cbd15bb..a9e9870c 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -792,9 +792,6 @@ static int nftnl_rule_cmd_snprintf(char *buf, size_t size,
 	int ret, remain = size, offset = 0;
 	uint32_t inner_flags = flags;
 
-	if (size)
-		buf[0] = '\0';
-
 	inner_flags &= ~NFTNL_OF_EVENT_ANY;
 
 	ret = nftnl_cmd_header_snprintf(buf + offset, remain, cmd, type, flags);
diff --git a/src/ruleset.c b/src/ruleset.c
index cc43866c..3de9b872 100644
--- a/src/ruleset.c
+++ b/src/ruleset.c
@@ -846,9 +846,6 @@ nftnl_ruleset_do_snprintf(char *buf, size_t size, const struct nftnl_ruleset *rs
 	void *prev = NULL;
 	uint32_t inner_flags = flags;
 
-	if (size)
-		buf[0] = '\0';
-
 	/* dont pass events flags to child calls of _snprintf() */
 	inner_flags &= ~NFTNL_OF_EVENT_ANY;
 
@@ -922,9 +919,6 @@ static int nftnl_ruleset_cmd_snprintf(char *buf, size_t size,
 				    const struct nftnl_ruleset *r, uint32_t cmd,
 				    uint32_t type, uint32_t flags)
 {
-	if (size)
-		buf[0] = '\0';
-
 	switch (type) {
 	case NFTNL_OUTPUT_DEFAULT:
 	case NFTNL_OUTPUT_JSON:
diff --git a/src/set.c b/src/set.c
index 36e59c38..592ea246 100644
--- a/src/set.c
+++ b/src/set.c
@@ -895,9 +895,6 @@ static int nftnl_set_cmd_snprintf(char *buf, size_t size,
 	if (type == NFTNL_OUTPUT_XML)
 		return 0;
 
-	if (size)
-		buf[0] = '\0';
-
 	/* prevent set_elems to print as events */
 	inner_flags &= ~NFTNL_OF_EVENT_ANY;
 
diff --git a/src/set_elem.c b/src/set_elem.c
index a99876a9..e45dbc6b 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -696,8 +696,6 @@ static int nftnl_set_elem_cmd_snprintf(char *buf, size_t size,
 
 	if (type == NFTNL_OUTPUT_XML)
 		return 0;
-	if (size)
-		buf[0] = '\0';
 
 	ret = nftnl_cmd_header_snprintf(buf + offset, remain, cmd, type, flags);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);
diff --git a/src/table.c b/src/table.c
index db870cd9..cf61ddaa 100644
--- a/src/table.c
+++ b/src/table.c
@@ -378,9 +378,6 @@ static int nftnl_table_cmd_snprintf(char *buf, size_t size,
 {
 	int ret, remain = size, offset = 0;
 
-	if (size)
-		buf[0] = '\0';
-
 	ret = nftnl_cmd_header_snprintf(buf + offset, remain, cmd, type, flags);
 	SNPRINTF_BUFFER_SIZE(ret, remain, offset);