From nobody Sun Apr 09 21:35:26 2023 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 4Pvll369Xrz44JNp; Sun, 9 Apr 2023 21:35:27 +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 4Pvll33h2Jz4MJC; Sun, 9 Apr 2023 21:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076127; 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=Zmpsk/YH3JWL5aVNlQs+282zlo6WjXx5XYwKyurlvOM=; b=PM9827PQgjzxB3A1VKJNIih83uMhcFaR7FropOVGrJuekoRKES/A7yAdSseFgD1S9prtNY 36bcbhq4fiBR1PP+2aeGUIuRNDCoeuLVmnmatV9aQc6/QozUvTjINAyS/+FVHyCWVbj6aU Oh3K8X/9lmRA1qNszDlz56g0YSfoRpkoW3I6KN+A7MkPZ6r8PKNKUcI4t+iyhM83oKZ9o9 8sfmd5LXU3ImrH5MaoWPBB7L7fPT5LQ1fmwNlSjQ0Wg6CsyfCNf/Du7EUi27/f/3WEFCfV tKaU0UxhG4K3K5CvSPS12lyE1OJJcYvGKqDubhkSqJIad2tSQ0ZPV0CdTdAoyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076127; 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=Zmpsk/YH3JWL5aVNlQs+282zlo6WjXx5XYwKyurlvOM=; b=oh+Lx6z6ojzIa6sMfXxVkIILEDDw+1pHkq4LI4hWd1zvbDh1BG6B+1z5LtGDoZaPFiXyUH hEcfxmvB+Ff1AbkA727bOJmdb0xh8Nzk21le6y42Jv7dj9b/ZqLc8UnB7WrJWs9Ji8JyYJ upsgY6DAXwlPiZfo1PLGtk6CzNyRoQ3ubcTs4yi2I6SnYZ/zdK4nA2Ti+Tb7fCw8zofKHa io76Jcn60/lp4Ut9nh5He8eeK3/1f+ksNSeC/2/sI4TjevVpqjQSlTxA/PEL6EApa40hvb BfMht7XCoTjS9IXwLo5xRUCysRqqxGPRbn4i5IilClSjbTVXoqa8lQ3RrUgO/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681076127; a=rsa-sha256; cv=none; b=N73zD64SAPTFQzs3bAPbcl7OzTGP+bQIJ9qGf1Fr2p+gdSUgrvjAN3Wx5ApKehPQ+JtsQz wmMKefmMeZPwDdACnr6PVTXijjbiHfaUYP4mi8RnzoXVWmx0J5jDyKJXCnYe3O3k+2dBOD oCdzPb9WjfA6g20VHCDFc//f2leArmK6A+gHHbMSP1Lmmu1Z9kI74byuPRWdv+2Vx0+/Zy 7mgMPoxB2jK8xcAzSRRpN08qkQY7iMAudeqIRW+Z2vhT/ZLA8P/Q2mP9mYjPuGuFk/htKV 9Eo4mYHiTodCMvbktVnA8u1uTpvq2TOTTtblKCyMzfPpH48gYlKQO12DAxxlIw== 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 4Pvll30LStzPkk; Sun, 9 Apr 2023 21:35:27 +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 339LZQfj081724; Sun, 9 Apr 2023 21:35:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339LZQfA081723; Sun, 9 Apr 2023 21:35:26 GMT (envelope-from git) Date: Sun, 9 Apr 2023 21:35:26 GMT Message-Id: <202304092135.339LZQfA081723@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: 191d5e3704a9 - stable/13 - zlib: silence K&R warns 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: 191d5e3704a96611dac2ebaa035fdcd3afd63be5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=191d5e3704a96611dac2ebaa035fdcd3afd63be5 commit 191d5e3704a96611dac2ebaa035fdcd3afd63be5 Author: Mateusz Guzik AuthorDate: 2023-02-12 21:12:34 +0000 Commit: Dimitry Andric CommitDate: 2023-04-09 14:56:20 +0000 zlib: silence K&R warns Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit eca005d8531fd153f46f941f3101e73cdf181a0b) --- sys/conf/files | 18 +++++++++++------- sys/modules/zlib/Makefile | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 17dcd22facc7..d1024ae8b8bb 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4141,28 +4141,32 @@ libkern/strtouq.c standard libkern/strvalid.c standard libkern/timingsafe_bcmp.c standard contrib/zlib/adler32.c optional crypto | geom_uzip | \ - mxge | ddb_ctf | gzio | zfs | zlib + mxge | ddb_ctf | gzio | zfs | zlib \ + compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" contrib/zlib/compress.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-cast-qual" + compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype" contrib/zlib/crc32.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" contrib/zlib/deflate.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-cast-qual" + compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype" contrib/zlib/inffast.c optional crypto | geom_uzip | \ - mxge | ddb_ctf | gzio | zfs | zlib + mxge | ddb_ctf | gzio | zfs | zlib \ + compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" contrib/zlib/inflate.c optional crypto | geom_uzip | \ - mxge | ddb_ctf | gzio | zfs | zlib + mxge | ddb_ctf | gzio | zfs | zlib \ + compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" contrib/zlib/inftrees.c optional crypto | geom_uzip | \ - mxge | ddb_ctf | gzio | zfs | zlib + mxge | ddb_ctf | gzio | zfs | zlib \ + compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" contrib/zlib/trees.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" contrib/zlib/uncompr.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-cast-qual" + compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype" contrib/zlib/zutil.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile index 6391255e512b..178d3a3f7ab7 100644 --- a/sys/modules/zlib/Makefile +++ b/sys/modules/zlib/Makefile @@ -25,4 +25,6 @@ CWARNFLAGS.crc32.c+=${NO_WSTRICT_PROTOTYPES} # crc32.c:586 CWARNFLAGS.trees.c+=${NO_WSTRICT_PROTOTYPES} # trees.c:232 CWARNFLAGS.zutil.c+=${NO_WSTRICT_PROTOTYPES} # zutil.c:27,32 +CWARNFLAGS+=-Wno-deprecated-non-prototype + .include