From: Phil Sutter <phil@nwl.cc>
Date: Wed, 22 Nov 2023 02:49:09 +0000 (+0100)
Subject: ebtables: Drop append_entry() wrapper
X-Git-Tag: v1.8.11~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f3b7d1aa22bb026292bcf829836138a543d422a;p=thirdparty%2Fiptables.git

ebtables: Drop append_entry() wrapper

There is no point in having it when there is no code to share.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---

diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c
index a8ad57c7..3fa5c179 100644
--- a/iptables/xtables-eb.c
+++ b/iptables/xtables-eb.c
@@ -112,24 +112,6 @@ static int parse_rule_number(const char *rule)
 	return rule_nr;
 }
 
-static int
-append_entry(struct nft_handle *h,
-	     const char *chain,
-	     const char *table,
-	     struct iptables_command_state *cs,
-	     int rule_nr,
-	     bool verbose, bool append)
-{
-	int ret = 1;
-
-	if (append)
-		ret = nft_cmd_rule_append(h, chain, table, cs, verbose);
-	else
-		ret = nft_cmd_rule_insert(h, chain, table, cs, rule_nr, verbose);
-
-	return ret;
-}
-
 static int
 delete_entry(struct nft_handle *h,
 	     const char *chain,
@@ -1178,11 +1160,11 @@ print_zero:
 	} else if (command == 'F') {
 		ret = nft_cmd_rule_flush(h, chain, *table, flags & OPT_VERBOSE);
 	} else if (command == 'A') {
-		ret = append_entry(h, chain, *table, &cs, 0,
-				   flags & OPT_VERBOSE, true);
+		ret = nft_cmd_rule_append(h, chain, *table, &cs,
+					  flags & OPT_VERBOSE);
 	} else if (command == 'I') {
-		ret = append_entry(h, chain, *table, &cs, rule_nr - 1,
-				   flags & OPT_VERBOSE, false);
+		ret = nft_cmd_rule_insert(h, chain, *table, &cs,
+					  rule_nr - 1, flags & OPT_VERBOSE);
 	} else if (command == 'D') {
 		ret = delete_entry(h, chain, *table, &cs, rule_nr - 1,
 				   rule_nr_end, flags & OPT_VERBOSE);