From: Phil Sutter <phil@nwl.cc>
Date: Thu, 28 Sep 2017 15:17:42 +0000 (+0200)
Subject: exthdr: Simplify tcp option printing a bit
X-Git-Tag: v0.8~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c4747d04075ad1e79aa0f346e7227a43e72405e;p=thirdparty%2Fnftables.git

exthdr: Simplify tcp option printing a bit

This eliminates the need for that temporary buffer.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/exthdr.c b/src/exthdr.c
index 4add3da2..37c76884 100644
--- a/src/exthdr.c
+++ b/src/exthdr.c
@@ -31,17 +31,13 @@ static void exthdr_expr_print(const struct expr *expr, struct output_ctx *octx)
 		 * multiplicator
 		 */
 		unsigned int offset = expr->exthdr.offset / 64;
-		char buf[9] = {0};
 
-		if (expr->exthdr.flags & NFT_EXTHDR_F_PRESENT) {
-			printf("tcp option %s", expr->exthdr.desc->name);
+		printf("tcp option %s", expr->exthdr.desc->name);
+		if (expr->exthdr.flags & NFT_EXTHDR_F_PRESENT)
 			return;
-		}
-
 		if (offset)
-			snprintf(buf, sizeof buf, "%d", offset);
-		printf("tcp option %s%s %s", expr->exthdr.desc->name, buf,
-					     expr->exthdr.tmpl->token);
+			printf("%d", offset);
+		printf(" %s", expr->exthdr.tmpl->token);
 	} else {
 		if (expr->exthdr.flags & NFT_EXTHDR_F_PRESENT)
 			printf("exthdr %s", expr->exthdr.desc->name);