From nobody Sun Jul 24 11:01:51 2022 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 4LrKxX0yFzz4XXDG; Sun, 24 Jul 2022 11:01:52 +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 4LrKxW6FDlz3bDp; Sun, 24 Jul 2022 11:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660511; 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=nuR6XaB8aGjtsjpqIt3zw2F6r3CNBKqy15/BJacUkdY=; b=mpbi9uMPpinZBPYSxbcam/LV+NbKBy48RnIj6q+yN2g6pB3C58paGOpDtarBLgblzHOlR4 l+z+ZkOfZ+t7a8hlT8bZL4r8Umy99NPp4gtdSngLs60ID0cnIiXE5kbzB5VoHHhI6cGgyQ RUyhnnc/6mFDWKF1Lw9e6pWOOOK3rCp9o1/Aw7bmaff4i6mAI24LDRGJrLIAcj0qsIyPA1 hWPnF69jNM77N1kmLOYcGHXabkD8DvkUabs2897nmDQ4cCtDqO53D6ccTIgyzOLTGTIQGH Ue/5WH59KqRA5tdTJd/tOJyIi1D3Pnh593EFXOa1ZKpVrGd908PDPVzNGgvPpw== 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 4LrKxW545jzGj5; Sun, 24 Jul 2022 11:01:51 +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 26OB1p84040848; Sun, 24 Jul 2022 11:01:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OB1pti040847; Sun, 24 Jul 2022 11:01:51 GMT (envelope-from git) Date: Sun, 24 Jul 2022 11:01:51 GMT Message-Id: <202207241101.26OB1pti040847@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: e09ac99afb00 - stable/13 - Adjust ipfw_{init,destroy}_*() definitions to avoid clang 15 warning 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e09ac99afb00f9740b4e0227cbb0dcccd4c7338e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660511; 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=nuR6XaB8aGjtsjpqIt3zw2F6r3CNBKqy15/BJacUkdY=; b=d+AjEX6LLmNi0YU2OwLaMBFlQhuGmKCfn0KmgAb8c1HUGjG9A9gUSlRXVu4p3wUUE4D0mU uvyiT6D4ez2oWvpl+YrCpsjOOEeOgbXoMVabVXx0Bw4t9hM3q4ZPWBcWxPlr08EsKA+b1I Gn2mvIHirgwGNa2ozb+QosRGbThwIUeWaP2fobSylvoSK6qQ1h19Ep5kgpbpR6x4mq49CE sWoWD/6I+xFuO7k7wsUkZnXcWfMhWAkXj8q6fJdDf+ztjwzgSM4YcLi76hR6f2p2o9+a7l oRFoSG8fgzPqUT6+5cnEh51kzbWe2GNpupeGY4+qpXbYRyLN3ct8YajPYJsJfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658660511; a=rsa-sha256; cv=none; b=JvXY2FH+N8HllwQFT2VqzS2BowGAgwq/hgiuPxlZyM2xTVYmHqh+C4MS8Pvvbws/UOABHh FNxFjhWFfbBuQlkuXb2PV67S2BpbNPAfjCwi55iaeMcdrFpedfgU2KSfcvDKASiGJB84Yu F4MXPEm9Kx5Tpi/OBkeZqAo2wFzGs6z4V56lpJaWLR5EoWCLlr3ui9xHiKNFHadn7SxEhJ W/qzm/3uLTq2dJlxwmNNeug86s89K+e+EwlweztePwT+a6lOhrD+1w01+oBRBErH8IKTF0 7dnCIKp7PO1PJ+deVodSWdjXqIAfOfFoq8jk4b9/XrExWQYvH2u2HMRHjVPWtQ== 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=e09ac99afb00f9740b4e0227cbb0dcccd4c7338e commit e09ac99afb00f9740b4e0227cbb0dcccd4c7338e Author: Dimitry Andric AuthorDate: 2022-07-21 19:23:13 +0000 Commit: Dimitry Andric CommitDate: 2022-07-24 11:00:09 +0000 Adjust ipfw_{init,destroy}_*() definitions to avoid clang 15 warning With clang 15, the following -Werror warnings are produced: sys/netpfil/ipfw/ip_fw_sockopt.c:187:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] ipfw_init_counters() ^ void sys/netpfil/ipfw/ip_fw_sockopt.c:196:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] ipfw_destroy_counters() ^ void sys/netpfil/ipfw/ip_fw_sockopt.c:3241:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] ipfw_init_obj_rewriter() ^ void sys/netpfil/ipfw/ip_fw_sockopt.c:3249:26: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] ipfw_destroy_obj_rewriter() ^ void This is because ipfw_init_counters(), ipfw_destroy_counters(), ipfw_init_obj_rewriter(), and ipfw_destroy_obj_rewriter() 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 62030bb8538cb3775f6259c81c2c30a533f3ab10) --- sys/netpfil/ipfw/ip_fw_sockopt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c index 0656d941e912..6d2a119ecbe0 100644 --- a/sys/netpfil/ipfw/ip_fw_sockopt.c +++ b/sys/netpfil/ipfw/ip_fw_sockopt.c @@ -184,7 +184,7 @@ VNET_DEFINE_STATIC(uma_zone_t, ipfw_cntr_zone); #define V_ipfw_cntr_zone VNET(ipfw_cntr_zone) void -ipfw_init_counters() +ipfw_init_counters(void) { V_ipfw_cntr_zone = uma_zcreate("IPFW counters", @@ -193,7 +193,7 @@ ipfw_init_counters() } void -ipfw_destroy_counters() +ipfw_destroy_counters(void) { uma_zdestroy(V_ipfw_cntr_zone); @@ -3240,7 +3240,7 @@ update_opcode_kidx(ipfw_insn *cmd, uint16_t idx) } void -ipfw_init_obj_rewriter() +ipfw_init_obj_rewriter(void) { ctl3_rewriters = NULL; @@ -3248,7 +3248,7 @@ ipfw_init_obj_rewriter() } void -ipfw_destroy_obj_rewriter() +ipfw_destroy_obj_rewriter(void) { if (ctl3_rewriters != NULL)