from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=txvNQoxLVh+ijFw45YYjQHjS4nRV75TxTP76foQJ6tU=;
	b=jBVyKxZM0ewkjSjW6MPnLAETaBFS0qO6iQW59OgtrRYRxxwJrJehnD4qZAldH31bHZ5L9M
	+Q4Pn0HRA6XMSZOGCNQKifW6bK4Fgf81CY9FRJoYzzqbFjH434Oivt0k0UOK27Z9a+zuNV
	bxOwseym4efB92/PJ6g0Fy7wTRsMQJnoNFZMDAG0vS7L+SA70pecrTzPwL9E2bqEj1K6cT
	9n4AANTyzZXfJAkrWxdwFKo29Kn4eeTvW8koBR9MZL8VQXrOCDTkdVwO7pgV64Qh8yxVix
	vKu+JAoMM/9gP1jqVpjPAXTWe6qwJ8c9e1GLtvPxyE8p5ag2ugGeMqy3cHY5dw==
Date: Mon, 13 Oct 2025 10:14:00 GMT
Message-Id: <202510131014.59DAE0SA064327@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Zhenlei Huang <zlei@FreeBSD.org>
Subject: git: 1bba2194c8a9 - main - ipfw: Use proper prototype for
  SYSINIT functions
Sender: owner-dev-commits-src-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Auto-Submitted: auto-generated

The branch main has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=1bba2194c8a960235f8eae36e7d3e96f347ce779

commit 1bba2194c8a960235f8eae36e7d3e96f347ce779
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2025-10-13 10:12:33 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2025-10-13 10:12:33 +0000

    ipfw: Use proper prototype for SYSINIT functions
    
    The only possible return value of function ipfw_init() is 0. Make it
    return void to match the prototype of SYSINIT.
    
    MFC after:      1 week
---
 sys/netpfil/ipfw/ip_fw2.c    | 9 +++------
 sys/netpfil/ipfw/ip_fw_nat.c | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c
index b59d8d08bf80..d15d7760d7f1 100644
--- a/sys/netpfil/ipfw/ip_fw2.c
+++ b/sys/netpfil/ipfw/ip_fw2.c
@@ -3578,11 +3578,9 @@ sysctl_ipfw_tables_sets(SYSCTL_HANDLER_ARGS)
 /*
  * Stuff that must be initialised only on boot or module load
  */
-static int
-ipfw_init(void)
+static void
+ipfw_init(void *dummy __unused)
 {
-	int error = 0;
-
 	/*
  	 * Only print out this stuff the first time around,
 	 * when called from the sysinit code.
@@ -3627,14 +3625,13 @@ ipfw_init(void)
 	ipfw_init_sopt_handler();
 	ipfw_init_obj_rewriter();
 	ipfw_iface_init();
-	return (error);
 }
 
 /*
  * Called for the removal of the last instance only on module unload.
  */
 static void
-ipfw_destroy(void)
+ipfw_destroy(void *dummy __unused)
 {
 
 	ipfw_iface_destroy();
diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c
index 1e2ff1bca290..1cee7873de31 100644
--- a/sys/netpfil/ipfw/ip_fw_nat.c
+++ b/sys/netpfil/ipfw/ip_fw_nat.c
@@ -1166,7 +1166,7 @@ vnet_ipfw_nat_uninit(const void *arg __unused)
 }
 
 static void
-ipfw_nat_init(void)
+ipfw_nat_init(void *dummy __unused)
 {
 
 	/* init ipfw hooks */
@@ -1183,7 +1183,7 @@ ipfw_nat_init(void)
 }
 
 static void
-ipfw_nat_destroy(void)
+ipfw_nat_destroy(void *dummy __unused)
 {
 
 	EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag);