From: Jeremy Sowden <jeremy@azazel.net>
Date: Tue, 30 Nov 2021 10:55:58 +0000 (+0000)
Subject: output: JSON: optimize appending of newline to output
X-Git-Tag: ulogd-2.0.8~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5d2789474494fae044a48fbffe84601f3f40374;p=thirdparty%2Fulogd2.git

output: JSON: optimize appending of newline to output

We have `buflen` available.  We can remove `strncat` and assign the characters
directly, without traversing the whole buffer.

Fixes a compiler warning:

  logd_output_JSON.c:407:9: warning: `strncat` specified bound 1 equals source length

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c
index 2166d15..913dfb8 100644
--- a/output/ulogd_output_JSON.c
+++ b/output/ulogd_output_JSON.c
@@ -404,8 +404,8 @@ static int json_interp(struct ulogd_pluginstance *upi)
 		return ULOGD_IRET_ERR;
 	}
 	buf = tmp;
-	strncat(buf, "\n", 1);
-	buflen++;
+	buf[buflen++] = '\n';
+	buf[buflen]   = '\0';
 
 	if (opi->mode == JSON_MODE_FILE)
 		return json_interp_file(upi, buf);