From nobody Sat Jan 31 17:04:24 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 4f3K3s3cFkz6QWwM for ; Sat, 31 Jan 2026 17:04:25 +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 4f3K3s0D6Cz3Sd4 for ; Sat, 31 Jan 2026 17:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769879065; 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=XurPIQwpgzgvOnIwAfT1EHQJOeLuAy4WGrzWkzbvzlI=; b=exPfaWZTt7B+yuQHHEs7ZGermklVg1e+27DPnL4jU7y9xk/pb5H4uVp0zF98lAnFdCix65 pYiXDXl5jrD+T/k/GX9AcOUrFat67Yi/0KvwdxLa2Xn5ovjcE/d3jC/oaPqKpzA0R7HUu1 0zrpmn5la3v4IqcuJVEiCJhXxOG/8/bZhkxCU0WHX9XLVWpr/sAhVOTdJ+fY9Y+MHZ28y/ DIk/b99GkdDKbWSfQnWwtrO67STIruBpmC1AGwWLHgu7nicgIXwKdmnCQHKKuMpcuHMHjY 0gtnQcrwvA78AKWx1vpiAYbt7I/btCZLUyJ23MpqXYPMQXZNjADUEx47SaMqkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769879065; a=rsa-sha256; cv=none; b=o1/vG1to8qxfQYVD8VOvQpgiAUNfybDWKSTaktxNWuIY3q/QdiJ3e7eoLx96K+mJyj20EN vPmhPBPTuCgCSQ43pKF0fZF5K5fi1N6lxGtyyqpMCI03UsYgFB5Z5hWNGvP8aecKvtyhh5 Qse1d3252HYr7f10lWLBgE8xqHbRjqo1JHm124Bfq8vi6NUy0tq/3/9apv+2bkH4LMg7Ny U+40oQsJqfnyiXPG1OAGKDGnt6vygefogIqx/fbLi0JukmHwXCAU1GRHDgJWebdm3aBYEW nTQ5JDe3qArrz0BE25XtsFRUkt6Ym/4rUIpG5OpvxD6lCf+8HlnGRkxw2YPcWA== 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=1769879065; 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=XurPIQwpgzgvOnIwAfT1EHQJOeLuAy4WGrzWkzbvzlI=; b=aMQOXyUM9Bl47zmjOmd2Da5Nya2ASMY1I6BpRyzS2WwvzjxgkAqO2yt38wZTaRsvXC02jT ANbtboynXePsgDZrQmS61YHawfp4IG5UHU/RYiswbmobiNIjuVSVZvQhWC8RAPhz2nDG8b /dKb8KwXqDBa6aIQJkVW6/XvBS5ChsavzsEJY12Oasmsj0LBJPinmA8//53KkEyChwv6WC nLuz00OKlsHxTsM6InlBvSDZqGUGbvKdtkVIl87CMoY8EphI/iU7pSLIP5r99saZkZ+atd mrju7Pe+MQDxjdBwrUymWBPRzxC6Nv0ISVc3EF87s54hdwLX80+j5bAkV1YaiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3K3r6Z1Kz137D for ; Sat, 31 Jan 2026 17:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a400 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 17:04:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 745b6ca4ed93 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 745b6ca4ed933f9f4c1d314dc7b0aa31e8e9e0de Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 17:04:24 +0000 Message-Id: <697e3618.1a400.23b9a1fe@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=745b6ca4ed933f9f4c1d314dc7b0aa31e8e9e0de commit 745b6ca4ed933f9f4c1d314dc7b0aa31e8e9e0de Author: Zhenlei Huang AuthorDate: 2025-10-13 10:12:33 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 17:01: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) --- 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 2b7f38d2e9a6..c27b6bc274fb 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 19393d5b8444..8bd27f6885ab 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -1168,7 +1168,7 @@ vnet_ipfw_nat_uninit(const void *arg __unused) } static void -ipfw_nat_init(void) +ipfw_nat_init(void *dummy __unused) { /* init ipfw hooks */ @@ -1185,7 +1185,7 @@ ipfw_nat_init(void) } static void -ipfw_nat_destroy(void) +ipfw_nat_destroy(void *dummy __unused) { EVENTHANDLER_DEREGISTER(ifaddr_event, ifaddr_event_tag);