From nobody Fri Jul 29 18:47: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 4Lvc2p1DvNz4Y1ZT; Fri, 29 Jul 2022 18:47: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 4Lvc2n5NV8z3qBF; Fri, 29 Jul 2022 18:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120465; 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=p2MhjhLT+ETemOCe8dAXPm4w5EcaZIuFLRK8PKA3W/E=; b=xYNvCDuhpEFXRcusmv7pHLea6tNn36n6HoeQLtxIB8Plpjqqr8EWmL0PCDt41BLGuMPGsp LiL5ARcT/jnRhgfgaiXGOxQpBcv3Nmb2KJsqXfDLBH6wRIqUxwPhS6i2/rr/V3/A4O5Jrl adhzVmxBDJSIOKDjXw8PL/IpY/Rwik3Ukjsy+Ev+nj8yHIRBeVMqK+kd2qTM801yI05a7g o797ijfkchio5kivjbwWnyMLhlo9wpwMuuCWwV94Y+ML/o1tZfflWxmk3doyhrfNIwWNY9 w8sbP1nzgSH7dN9bh0PecDdWrltXIjmsUYPDby+VOSwr2+8AiQV2NyJuNoYBVg== 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 4Lvc2n4TfszmB4; Fri, 29 Jul 2022 18:47:45 +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 26TIljFl024526; Fri, 29 Jul 2022 18:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TIlj3U024525; Fri, 29 Jul 2022 18:47:45 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:47:45 GMT Message-Id: <202207291847.26TIlj3U024525@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: 823283ab45b8 - stable/13 - Adjust function definitions in netipsec's key.c to avoid clang 15 warnings 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: 823283ab45b8e705dbe6c44a6570e50d0151ae65 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120465; 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=p2MhjhLT+ETemOCe8dAXPm4w5EcaZIuFLRK8PKA3W/E=; b=GqVO4dQtXWt3FxZzzAQCQZAQMUrSaqDPbK8Ot70RCB5CAr6jl5FN/Ut93Nu4iAlzrkifMg WGFqUJFcRM8Zz65H6YETMKcK6eqhdHmrjrTcmcBAIkN6Ov+NOPkvF713QFMCdud9/BIXTL ttli0M/ksOOmw5EcV56ZQyUGjr8mmJvZfLWuizBFRJAKYNVV2AkMsJAO+bKXcMIwDqKWp+ EuYKG9pNKARh4FrWPlSQ2gLi5ZHSBqlY1mmSSiKgyrBEaa59zzLTfDhizaJx+drqfAraCC xWrvQj99UulyzZx7ACTI1b/mvtwCZ/2IyafuI/ttdS68KOfvNjqDowEX55lJIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120465; a=rsa-sha256; cv=none; b=aTZsWs7VsCMXJEPX7qnsdYHbVrsDtOhyBUs9lrFuO+wa0voUdIkM9xOI7yxt/VxEeAk5oE fmN4Fp7SDOv1++ChMtHT2/TjX5TL2B1CdghJjIjd5IdA7h77VzEKOz7JU/su4emPJbZL9m IXoY9WSUpQ4n0eFNghkOw2Hf2R0G39SvdyFvIXfh13N56ixosssSmK0PNpkzgrlSwlpSHI GkDIkWup95HyJK8W0yVlbAHVlHkapsPf2Z+T1han0CtPam/rSJfBw+cTlDJmECg/LEs7a1 ziqfzd1l3BWN7pfHkZJwhPAkkcHTJGXHmHPUcGC+UIM11WK4hQN38fgAQfODsQ== 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=823283ab45b8e705dbe6c44a6570e50d0151ae65 commit 823283ab45b8e705dbe6c44a6570e50d0151ae65 Author: Dimitry Andric AuthorDate: 2022-07-26 19:15:37 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 18:31:12 +0000 Adjust function definitions in netipsec's key.c to avoid clang 15 warnings With clang 15, the following -Werror warnings are produced: sys/netipsec/key.c:6432:15: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] key_getcomb_ah() ^ void sys/netipsec/key.c:6489:19: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] key_getcomb_ipcomp() ^ void This is because key_getcomb_ah() and key_getcomb_ipcomp() 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 8bd2887be5105010e73fc35ddd25021e186811b8) --- sys/netipsec/key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index b9d867a1d83a..4bb46cd9a5c1 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -6377,7 +6377,7 @@ key_getsizes_ah(const struct auth_hash *ah, int alg, u_int16_t* min, * XXX reorder combinations by preference */ static struct mbuf * -key_getcomb_ah() +key_getcomb_ah(void) { const struct auth_hash *algo; struct sadb_comb *comb; @@ -6434,7 +6434,7 @@ key_getcomb_ah() * XXX reorder combinations by preference */ static struct mbuf * -key_getcomb_ipcomp() +key_getcomb_ipcomp(void) { const struct comp_algo *algo; struct sadb_comb *comb;