diff mbox series

[ulogd2,v2,08/27] filter: HWHDR: replace `switch` with `if`

Message ID	20211106164953.130024-9-jeremy@azazel.net
State	Changes Requested
Delegated to:	Pablo Neira
Headers	show Return-Path: <netfilter-devel-owner@vger.kernel.org> From: Jeremy Sowden <jeremy@azazel.net> To: Netfilter Devel <netfilter-devel@vger.kernel.org> Subject: [ulogd2 PATCH v2 08/27] filter: HWHDR: replace `switch` with `if` Date: Sat, 6 Nov 2021 16:49:34 +0000 Message-Id: <20211106164953.130024-9-jeremy@azazel.net> In-Reply-To: <20211106164953.130024-1-jeremy@azazel.net> References: <20211106164953.130024-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Compiler Warning Fixes \| expand [ulogd2,v2,00/27] Compiler Warning Fixes [ulogd2,v2,01/27] include: add format attribute to __ulogd_log declaration [ulogd2,v2,02/27] ulog: remove empty log-line [ulogd2,v2,03/27] ulog: fix order of log arguments [ulogd2,v2,04/27] ulog: correct log specifiers [ulogd2,v2,05/27] output: IPFIX: correct format-specifiers [ulogd2,v2,06/27] jhash: add "fall through" comments to switch cases [ulogd2,v2,07/27] db: add missing `break` to switch-case [ulogd2,v2,08/27] filter: HWHDR: replace `switch` with `if` [ulogd2,v2,09/27] filter: HWHDR: re-order KEY_RAW_MAC checks [ulogd2,v2,10/27] filter: HWHDR: remove zero-initialization of MAC type [ulogd2,v2,11/27] Replace malloc+memset with calloc [ulogd2,v2,12/27] filter: PWSNIFF: replace malloc+strncpy with strndup [ulogd2,v2,13/27] input: UNIXSOCK: remove stat of socket-path [ulogd2,v2,14/27] input: UNIXSOCK: fix possible truncation of socket path [ulogd2,v2,15/27] input: UNIXSOCK: prevent unaligned pointer access [ulogd2,v2,16/27] output: DBI: fix deprecation warnings [ulogd2,v2,17/27] output: DBI: fix string truncation warnings [ulogd2,v2,18/27] output: MYSQL: Fix string truncation warning [ulogd2,v2,19/27] output: PGSQL: Fix string truncation warning [ulogd2,v2,20/27] output: SQLITE3: Fix string truncation warnings and possible buffer overruns [ulogd2,v2,21/27] output: SQLITE3: catch errors creating SQL statement [ulogd2,v2,22/27] util: db: fix possible string truncation [ulogd2,v2,23/27] output: JSON: fix output of GMT offset [ulogd2,v2,24/27] output: JSON: fix printf truncation warnings [ulogd2,v2,25/27] output: JSON: optimize appending of newline to output [ulogd2,v2,26/27] output: JSON: fix possible truncation of socket path [ulogd2,v2,27/27] output: IPFIX: remove attribute macros

Commit Message

Jeremy Sowden Nov. 6, 2021, 4:49 p.m. UTC

The `switch` has one case falling through to a default.  Simplify the
flow-control.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 filter/ulogd_filter_HWHDR.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff mbox series

Patch

diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c
index 10c95c4e9bb0..d756d35577f0 100644
--- a/filter/ulogd_filter_HWHDR.c
+++ b/filter/ulogd_filter_HWHDR.c
@@ -207,19 +207,17 @@  static int interp_mac2str(struct ulogd_pluginstance *pi)
 		okey_set_u16(&ret[KEY_MAC_TYPE], type);
 	}
 
-	switch (type) {
-		case ARPHRD_ETHER:
-			parse_ethernet(ret, inp);
-		default:
-			if (!pp_is_valid(inp, KEY_RAW_MAC))
-				return ULOGD_IRET_OK;
-			/* convert raw header to string */
-			return parse_mac2str(ret,
-					    ikey_get_ptr(&inp[KEY_RAW_MAC]),
-					    KEY_MAC_ADDR,
-					    ikey_get_u16(&inp[KEY_RAW_MACLEN]));
-	}
-	return ULOGD_IRET_OK;
+	if (type == ARPHRD_ETHER)
+		parse_ethernet(ret, inp);
+
+	if (!pp_is_valid(inp, KEY_RAW_MAC))
+		return ULOGD_IRET_OK;
+
+	/* convert raw header to string */
+	return parse_mac2str(ret,
+			     ikey_get_ptr(&inp[KEY_RAW_MAC]),
+			     KEY_MAC_ADDR,
+			     ikey_get_u16(&inp[KEY_RAW_MACLEN]));
 }