From nobody Mon Mar 6 19:26:57 2023 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 4PVpVT3v0zz3wH7M; Mon, 6 Mar 2023 19:26:57 +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 4PVpVT3PgFz4Ldx; Mon, 6 Mar 2023 19:26:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678130817; 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=Gb22mnyMl8JUxNpejfMo/UeCB1mAhLWld9A53Gh5v1s=; b=oNCFU2nUs8RgBmxHbyjD5aKfowV3NK+ytO2isbByhCws4/fMS/OnmoaTzCYUoGc63//LrS /m1frVNdky6Wfouu4L99HQR442KZLbRnDjrAdSLZObKO5ZmRztxi+C7TVF+Gnp+Ii9COeT 32naBFr9WMLPTWe5iskM/kXRLLK2mCEQIx4CkFMHedXOM6rXKhjwcQAvo2HazVxNRINNhQ jGHknJnNStZ+cyrAMAFCdh2qFhbQd06/zj0wQEFAiPbWHBZUaQMkMJBphXd0NDZOJaPZiy 2GfH1YyriUrD9EYB1Jag1e/IIFEHa1nZ8W6dzkZ1J6uscGCfeIpfFEpPSnLniA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678130817; 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=Gb22mnyMl8JUxNpejfMo/UeCB1mAhLWld9A53Gh5v1s=; b=U3GJ0ZjTOb0OBc7DOpJsRhzmsfc2BgmL2L2XYzYgbAulHU//KVe/OyziYa7L16CB3gOxaa Z419fr4u8lOV+f9J4Syz4YWtnRxBQoPH2pUkokWNDq9K0U12A31prR9FWGjaCPslgrXkIG JJH+0t0W60Kf85qMFzl9LfXN8PppmTfM1NrzUWWBbNA0UzOp1W0di6wIL52KUiwnZRNSrI fQmVT3pserAdxJDPBWFiIcMpwAQo/l8ahpBPwaLhuHR8xyjeRSeYrFRYxneDq98yykMdOv XeaPfVINLNaPbIBXT8WiZoiEMGRHfxZH9sBmiGf61sF0rlQ+VWYvUed2xNpOTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678130817; a=rsa-sha256; cv=none; b=LA/X8WlTRlwcfiXx8Fl60X2y8DPjgIC094VntrxEm34l+caibNHYzNFPr1l7bgoXEc6NHW 5CAEFjTf6ZwfrzXaaZY7P61quxXfWYOEOBQC6T+7eVEbOc4aS6XXNmKc16qALjZPdytHAB oKcE1ew2ksTaHXfz8utNjR3TN+fZTKHGXjPWsnRZdf4MTyyqvxSGGfE2akJcObu1mL1/lD JRy93KVFSJiJ6skwUBrcVVCIRYz9bKutN/5cg1pPHmk3bLrmFmqAmP2rTw52ENgU17u70g Zlm/iNHZehGlznz1bnrIEiPPbRLV27XdhwQslXhIQxNver00htvRJyBJCEjiSw== 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 4PVpVT2SCnz1CgM; Mon, 6 Mar 2023 19:26:57 +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 326JQv31004172; Mon, 6 Mar 2023 19:26:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326JQvu0004171; Mon, 6 Mar 2023 19:26:57 GMT (envelope-from git) Date: Mon, 6 Mar 2023 19:26:57 GMT Message-Id: <202303061926.326JQvu0004171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9f1beeaed4d5 - main - pfctl: fix superblock printf format mismatch 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f1beeaed4d5490e76f1eca2fc68c725a933ec7f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9f1beeaed4d5490e76f1eca2fc68c725a933ec7f commit 9f1beeaed4d5490e76f1eca2fc68c725a933ec7f Author: Kajetan Staszkiewicz AuthorDate: 2023-03-06 07:08:41 +0000 Commit: Kristof Provost CommitDate: 2023-03-06 18:22:35 +0000 pfctl: fix superblock printf format mismatch It is impossible to compile pfctl with OPT_DEBUG due to integer width mismatch: /usr/home/kajetan.staszkiewicz/freebsd.git/sbin/pfctl/pfctl_optimize.c:1479:9: error: format specifies type 'unsigned int' but the argument has type 'unsigned long' [-Werror,-Wformat] i - pf_rule_desc[closest].prf_off--- pfctl_optimize.o --- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/home/kajetan.staszkiewicz/freebsd.git/sbin/pfctl/pfctl_optimize.c:52:44: note: expanded from macro 'DEBUG' printf("%s: " str "\n", __FUNCTION__ , ## v) ~~~ ^ 1 error generated. Reviewed by: kp Obtained from: OpenBSD (pfctl_optimize.c 1.15) Differential Revision: https://reviews.freebsd.org/D38918 --- sbin/pfctl/pfctl_optimize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl_optimize.c b/sbin/pfctl/pfctl_optimize.c index d999734a906c..99c597ec84c1 100644 --- a/sbin/pfctl/pfctl_optimize.c +++ b/sbin/pfctl/pfctl_optimize.c @@ -1476,7 +1476,7 @@ superblock_inclusive(struct superblock *block, struct pf_opt_rule *por) } if (closest >= 0) - DEBUG("superblock break @ %d on %s+%xh", + DEBUG("superblock break @ %d on %s+%zxh", por->por_rule.nr, pf_rule_desc[closest].prf_name, i - pf_rule_desc[closest].prf_offset -