The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=846393be8cf83081b56ca77dd6c4a3c3ddbbe5c5
commit 846393be8cf83081b56ca77dd6c4a3c3ddbbe5c5 Author: Zhenlei Huang <[email protected]> AuthorDate: 2025-10-13 10:12:33 +0000 Commit: Zhenlei Huang <[email protected]> CommitDate: 2026-01-31 18:25:05 +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 (cherry picked from commit 1bba2194c8a960235f8eae36e7d3e96f347ce779) (cherry picked from commit 745b6ca4ed933f9f4c1d314dc7b0aa31e8e9e0de) --- 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 928ccefe4803..ea8aa3c0f491 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -3441,11 +3441,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. @@ -3490,14 +3488,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 c97bf4bf80a9..69b21eac041c 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -1169,7 +1169,7 @@ vnet_ipfw_nat_uninit(const void *arg __unused) } static void -ipfw_nat_init(void) +ipfw_nat_init(void *dummy __unused) { /* init ipfw hooks */ @@ -1186,7 +1186,7 @@ ipfw_nat_init(void) } static void -ipfw_nat_destroy(void) +ipfw_nat_destroy(void *dummy __unused) { EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag);
