From nobody Sat Jan 31 18:27:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f3LwB6SCBz6QgPf for ; Sat, 31 Jan 2026 18:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3LwB4g7cz42Dq for ; Sat, 31 Jan 2026 18:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769884074; h=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=4iwnKl3stA1zUq9VJwPMGoCEuzmE0UtcbizvoVtz5Os=; b=hRl9Jvrgdr448UmVtTbxj7lgmfjuiCBozLef6zaIfLhdGnojUH5XfwJ0fLLpSRJom6iFOa DxYZOFSfSU240pLeD1AupP7BdFuHMPSNKm/y9V+h2UxLUmVlzif83+2IfZcuBDfXG8gP4Z x1hN76qhpqJImn1lVpRMGWta2n2jnZNcDgjWWh3LWznki8O4Z7nzSqbsYprQvmoQxJh4lg Gi93rbhbQt4W0rbopi1oiFg0AuPn2LXwFuwWxWLTP+byL0IOFPYByzI7JC+V4WTNK0MwGr P+jGWD7pmhZTwdK4UT5ew5UAfOi0oDOVdkyZwzWJ8kKJDqUPIbH9+/BjiOg5uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769884074; a=rsa-sha256; cv=none; b=I/fzzHT5JX2I6RYxvRj7wjAqROTa95IEDVKExb4X4DFbI9NErmPp/tTNMbzWomfnlUEAEN Xujd5D8cwAoy48RTfaHGLzZzSkVFA13TWkfVMVwiywlHhWLeLNzQ2FNKcD5o/25NviCJFB beWjE6ZssGv4khhJPap1y7iMco2dtuvQxP6hPcQhy9uZ2BYD/1n3DEJwFOnRArdOh11Q61 hIIzO7SgDDGHSRbpHsYKqQlCTwZ5ek9lT6V5AEw99jB4IWafogsUgFMvSJNrzrQjNvkHRD vr9Qrgb8XVgmIm2tg6FF6B5nUpICmH5rF9zdt1rbaDMGYwnDBxQxMTWWb0QaNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769884074; h=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=4iwnKl3stA1zUq9VJwPMGoCEuzmE0UtcbizvoVtz5Os=; b=tath7bmS1ixY73SQv+0nmCCwKIcPYA86R1BQ6RGcH6gV+W5D8555RTH7VItCRt2VUbifBk 5gluti7kgUi2CW3JAYP57TddYJ67YYjIZJMwgmS7+ZSszoSfqVK5Cs9ks+HwAo3Oo70X36 VqRYzZIgLwaW54QxfpsXKRjVBnZ+OtVsMG1g/faDcY4R4wN3NFuwmEtmfBx2omghS+RPCb 5/A7yq5Sei0r8mG7TfOS5EYWUJoUY0W1xjIiSPdSgkYYFR77WiiTsY7wBkklL/ERm0XZbV nZzTCthSh0yLelMtUZrhcqW2CwLrkNGxdb6sUuEhJ4CVp1mVsd6MYT6sbLEYgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3LwB3rxDz15GJ for ; Sat, 31 Jan 2026 18:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24909 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 18:27:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 846393be8cf8 - stable/14 - ipfw: Use proper prototype for SYSINIT functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 846393be8cf83081b56ca77dd6c4a3c3ddbbe5c5 Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 18:27:54 +0000 Message-Id: <697e49aa.24909.6eed53bc@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=846393be8cf83081b56ca77dd6c4a3c3ddbbe5c5 commit 846393be8cf83081b56ca77dd6c4a3c3ddbbe5c5 Author: Zhenlei Huang AuthorDate: 2025-10-13 10:12:33 +0000 Commit: Zhenlei Huang 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);