From nobody Fri Jul 29 18:48:49 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 4Lvc414CGlz4Y22D; Fri, 29 Jul 2022 18:48:49 +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 4Lvc413drBz3v4t; Fri, 29 Jul 2022 18:48:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120529; 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=7uKmhrmfVHRCdUKprX3Tv5OKayZwfxysoxUf3X8NMaY=; b=YPdPsblZepFhJC6/Y0V3An3wbjBoQP/GT7Tk9fyLSc3VGNs1hJeHai3s6ZL/BPojoWfB6E r6qjoS2TIlIAvHlrqSQhTuWtlLtAlvg0LIZc3tza2tG6D+3fZhMMiFo3dcaVkka3wBIfYV 8uBroISnqgBrzWpPsdACEvgy7XW8ZU6hjoUASxx7/JBk6F0cjmpNmv/EUDD2H4/SAB7zYL 17TICWlh0wbN+QGkJa/oxJlID4qQTeOIO51dcL/LSGWTjxhuJvWbJL+qy+jodkvHaO7J/S rLJVzW80YS2RZal8KATqTetxsJ61oGdqkuPNFMW9GAv9r2u2O2KsyFwarq/MVQ== 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 4Lvc412ZJfzlRc; Fri, 29 Jul 2022 18:48:49 +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 26TImndT025880; Fri, 29 Jul 2022 18:48:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TImn06025879; Fri, 29 Jul 2022 18:48:49 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:48:49 GMT Message-Id: <202207291848.26TImn06025879@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: 2d70306aabb4 - stable/12 - Adjust function definitions in netipsec's key.c to avoid clang 15 warnings 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: 2d70306aabb4bf4c3a3cf746aba49963ea94bf56 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120529; 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=7uKmhrmfVHRCdUKprX3Tv5OKayZwfxysoxUf3X8NMaY=; b=kmt95GQpnzC1/VAa8+I85MxjinZxGLB/WLwmKTaRtYZCA3QUcjrW4SB7Zr8R4SJXr+TPg2 CoLpahwCqbEPAJ+LdbHwi1ynEiMa4aRYbaaL1ds9CV8TqyGguK2NxAKb10kblR2p761qVI o3diBie2Ja1lavqtCNXRVylKFcjwbYN3UerusVA9TzpZ3qkiXIfeUN0/eHfoxPffd7tZfF TfvuVvs6DWukXSeWOJxNUmQwVLWZDyerUosplzynrDJrb9gEK1kTsdNvy4WoUhRazvZZCk yQn5gUIVqu+7z28Kd/TXG8fObZ2J3W7xnFOUgaZSamoh39pZPcsFr9z9z1La9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120529; a=rsa-sha256; cv=none; b=rhWLhuDJaevo+TgKqmc2/uvg/vznV+7ZKNjD/Tqr32zJfT3FteBgtilot6dBpHjKVbl5YU E2GNht1r9srS+bxazLYnzoJ02HxnHXpmLMjRNrZFwMPTvUfslKN6INOFWbpdK9xuXf+KZC zaJs7KWLgT+GjsB3WU6K9mK1nZUFVyP7j9+dK3OmOa2J+38SbqRxUATLRwTvoGEHqbowrJ FhCSUKGAmjWueQjx9/smg2ysOIlTEJCriHc1farSKWK+qikjxN2VoxtWyvpiLp/It1aomy k9key5/AQqwJwTHAmYqo/RsrNq1KUWRtCCX6QbAxaAychdqGWKmH12FsuFi/FQ== 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=2d70306aabb4bf4c3a3cf746aba49963ea94bf56 commit 2d70306aabb4bf4c3a3cf746aba49963ea94bf56 Author: Dimitry Andric AuthorDate: 2022-07-26 19:15:37 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 18:45:14 +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 347aa821e358..4441cbacd9e5 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -6397,7 +6397,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; @@ -6455,7 +6455,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;