From nobody Sun Jul 24 11:01:45 2022 X-Original-To: dev-commits-src-all@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 4LrKxQ1Vpcz4XWwL; Sun, 24 Jul 2022 11:01:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LrKxQ0xglz3ZlB; Sun, 24 Jul 2022 11:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660506; 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=OwgKszEQSew5ET69KdiGAdtZk1h9aeG3mWdoNXlhYz8=; b=D6iPHSWACTXGSNWgJdfXUQvVNFppcTcF+xVDPyJDfc9QP2i/FcRdrS16O+JAfZEZ3dWkOx d5AUa/xWffGMsxYQgIceon76nD5VJqHoe47xbMvuIvUAN9Km9bK0QXYDYERXRvtBzvSPRB L1b3VEvb2+6w7PkzeWfIcvuxk8lTqQ1ivmOSjgWO2Tmlui6OvT7Yqa5F4QGL0pe5/75d6S dVfpi1DuaOl4BCB5kMHJ1LwAlbOgEimTsM2e95y1DzYdUUUehDSQ2T+Hurx4PKx9+Ve8PD e0UyG2sH3o0kCtO0EVOBpJrZPLeLi+BznBoka0dtaA5EywGBuyNFpSnCIc/atw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LrKxQ034kzGH6; Sun, 24 Jul 2022 11:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26OB1jFO040722; Sun, 24 Jul 2022 11:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OB1j0w040721; Sun, 24 Jul 2022 11:01:45 GMT (envelope-from git) Date: Sun, 24 Jul 2022 11:01:45 GMT Message-Id: <202207241101.26OB1j0w040721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5e5cf7e2aad4 - stable/13 - Adjust ipfw_{init,destroy}_sopt_handler() definitions to avoid clang 15 warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5e5cf7e2aad4f605499a418255b9a77532d87bbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660506; 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=OwgKszEQSew5ET69KdiGAdtZk1h9aeG3mWdoNXlhYz8=; b=kfQxppDseoTvATMcpgG01/VGNnkKGVb3LR99gBYPtS/XJuyo27nsgILPV4r7Z/ZnJTc2uu zJNRguvWaCteNYkTWUdpQ2Nu4KAeBZTaV3swnQ3G5X9C3biBGx3Tt8LlesV/29FSWtyZJE LD3sZ95A1eaM7l00kvI8cg7KrX2suSzbMAUjR2WlJLyw7iWPVzY81bFupHPzUoWaHQ0G7A Z9B9CYD//ByytbEQTZKwO+1ZP+e4OgxQFONAdjaSJr0wwtHj4i/Fvty4cg8ZQ4NEOVDpjF Fp7K4WTMZuLxnvQdwP+XNRdA8qoHmGBBsVXh/t4gP7gk2WKHN8DOh7KWssWuaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658660506; a=rsa-sha256; cv=none; b=BxEpyRMR3T6UUcNe7xytKrFanKgbQHJM59fCkeCcuoJbH9sQc4wRGqNh7g7k+wZJBRmodS iOBGN/7G90QPRwhrzHXMjQtiMBX1CnFwDGeoltXVH5I1cxx+dtt5aSc0+LNrs4EasX74CW nu/ylUzpFbiCptYYqbw1RfSfQPp5lFzzRvzy2HrcwnvS4b95g3v+HuJbCjsA6oBMqIA8sa gP/S9OIC1p681d+AYxSI5NijzXdU3Rrs7r+2e4Ry8XL60iPZued5BKlbiC78hkmx70kFFc XYxfYms+3JMMUg5FdD8DvcPYEI6o6F3Vtd1gpbmt4lwn+ktu6n3mJJdZECeP7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5e5cf7e2aad4f605499a418255b9a77532d87bbe commit 5e5cf7e2aad4f605499a418255b9a77532d87bbe Author: Dimitry Andric AuthorDate: 2022-07-21 19:30:05 +0000 Commit: Dimitry Andric CommitDate: 2022-07-24 11:00:08 +0000 Adjust ipfw_{init,destroy}_sopt_handler() definitions to avoid clang 15 warning With clang 15, the following -Werror warning are produced: sys/netpfil/ipfw/ip_fw_sockopt.c:3477:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] ipfw_init_sopt_handler() ^ void sys/netpfil/ipfw/ip_fw_sockopt.c:3485:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] ipfw_destroy_sopt_handler() ^ void This is because ipfw_init_sopt_handler() and ipfw_destroy_sopt_handler() are declared with (void) argument lists, but defined with empty argument lists. Make the definitions match the declarations. MFC after: 3 days (cherry picked from commit d62830c5e493133b0212f39c7efdab4232f87abf) --- sys/netpfil/ipfw/ip_fw_sockopt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c index 3f564c459f96..0656d941e912 100644 --- a/sys/netpfil/ipfw/ip_fw_sockopt.c +++ b/sys/netpfil/ipfw/ip_fw_sockopt.c @@ -3476,7 +3476,7 @@ find_unref_sh(struct ipfw_sopt_handler *psh) } void -ipfw_init_sopt_handler() +ipfw_init_sopt_handler(void) { CTL3_LOCK_INIT(); @@ -3484,7 +3484,7 @@ ipfw_init_sopt_handler() } void -ipfw_destroy_sopt_handler() +ipfw_destroy_sopt_handler(void) { IPFW_DEL_SOPT_HANDLER(1, scodes);