From nobody Sun Jul 24 11:02:21 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 4LrKy61RwLz4XXTv; Sun, 24 Jul 2022 11:02:22 +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 4LrKy60pHZz3dHD; Sun, 24 Jul 2022 11:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660542; 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=FmOs/gzP5TEbnL9369OfXmorSprcP6f67m/XeFbaqvE=; b=ddZSKytDVfal7XY1fy1iuDClZpA3hU7r2FbmIu4luAiYhW399ZSGKa86NYHpG4t+Sq+Yhx 4rmwuql6tsJAF+u2AZEIdD+2o0LOp35ZSNRHorfYyx+H/2IGB6YcVFZYHOahK1l+3T2I/U mbiXpKJig215jv3lqhnk3bzTwasCcShnYb6y9J/FhJ1QTXHgLZHfO6BYglrjFjMulFZgNK gOOLPXA26QrXHAGfPd1WlnfMnm5VHMeknWYJRlL7Wr9OVYuzPfoQ+yukvZPi82/6qhcoNX Q9hkcSpgW55VW4TAJ1SddGJkKrQWywpBBF109z+IVnaltrreM2OFq5bbDKJ9uA== 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 4LrKy571pRzGC6; Sun, 24 Jul 2022 11:02:21 +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 26OB2Lwm041434; Sun, 24 Jul 2022 11:02:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OB2LWY041433; Sun, 24 Jul 2022 11:02:21 GMT (envelope-from git) Date: Sun, 24 Jul 2022 11:02:21 GMT Message-Id: <202207241102.26OB2LWY041433@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: 1e60e1d13dca - stable/12 - Adjust ipfw_{init,destroy}_sopt_handler() 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/12 X-Git-Reftype: branch X-Git-Commit: 1e60e1d13dca4c70581a17aa3b2d8eb49dde8971 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658660542; 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=FmOs/gzP5TEbnL9369OfXmorSprcP6f67m/XeFbaqvE=; b=IMRJ0/qDdBYarYNYHb7rIvwBj76S5dFUwW91//9wZgXsdeNxcSqEcEI1e9fysoqg7QJTtr +QMwKOizy3Jrb2PGeGXsyHW5rgiTmfZnHeE8tKQnxzZbGn92kTKrKYJYqTaRGBzMOm7A/g a/eu641BfXiM+BXOs09LBWdL+rUnhPi3EqWc7z+QUOhnmQ+jhevlAoRKN6QedFKOvQNgft zEkGUE1gGLLfZzwOpvTWlzvqUzTKzf4BrmmAExmSxbfX0cjBr+B7UHqa1JsrY/8KreXFEB ApivWnOfpmqzbNkRp3yEA2pi8FwPnl1EdsWBKLh78VzziC43lMdaYVAG1EXsRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658660542; a=rsa-sha256; cv=none; b=O181mGPa3ZFm/+39CGoDuygy3RsskTbaX6BXrVaaf782IwJEJPRkQtqewxIWuddb04P+JU LuR914XdYyatnW6BiPAS3hSEnYGkJVpkk1UV2YX+bSI1fz6i8703s+82BIybsGCdkDjUKt WzAQMv/zDWBUcxIvNSYtJ4j26uEZC2bzH8wRiJNVjujUdnPr38oeFfaR2YVvpoP7YZdNNp 7KdWcpyPydU51RAeTPkR685T/Ah6UD51LJNvC0Ne793VKUDmr60ZM/+ijnzL5IbN9yaUu7 ENtfBXaI/+xkH3zJXRyKN5QCaHYxboMn06WP6pX7/bB3Re6Y5eCxBftz0ZYMsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1e60e1d13dca4c70581a17aa3b2d8eb49dde8971 commit 1e60e1d13dca4c70581a17aa3b2d8eb49dde8971 Author: Dimitry Andric AuthorDate: 2022-07-21 19:30:05 +0000 Commit: Dimitry Andric CommitDate: 2022-07-24 11:01:19 +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 327c81cac537..8414dd67b539 100644 --- a/sys/netpfil/ipfw/ip_fw_sockopt.c +++ b/sys/netpfil/ipfw/ip_fw_sockopt.c @@ -3491,7 +3491,7 @@ find_unref_sh(struct ipfw_sopt_handler *psh) } void -ipfw_init_sopt_handler() +ipfw_init_sopt_handler(void) { CTL3_LOCK_INIT(); @@ -3499,7 +3499,7 @@ ipfw_init_sopt_handler() } void -ipfw_destroy_sopt_handler() +ipfw_destroy_sopt_handler(void) { IPFW_DEL_SOPT_HANDLER(1, scodes);