From nobody Tue Jul 19 09:57:51 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 4LnDm00C7yz4WvQr; Tue, 19 Jul 2022 09:57:52 +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 4LnDlz5Rkpz45dY; Tue, 19 Jul 2022 09:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658224671; 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=RG79YW8cWVC29gXaaVT/lNxPj+g8suc5RVW3oHDXDV4=; b=X487Psj74rHPd3oQkFnEbDZwKvvqC27z0ILnKCmb9IgPeKLQkELRbF0CA6qSm0K0H4bPuv Tvo88f+AM5RtrWqrkviABWvEhalrwk0LCmWXtjORHF6SmBSTWDJRf7BLCo0Uh+jIeEKa7z YefYr6x8Zje6mJKiXOkKuQL7rxD+R+g+84lYd6vwVPiQLcy6/fCYGcoCV25JTBMuaOkJfD 8oXG+qT86fXu4j0P37m5H315p2Z5VGM0m4h5xDCYSJBhffjZMw6IOwetVSguiZwgchF7Bk zqOVpOEZpKEScTO6FMFWtVVX5GfgJO+Weo/+jDaEombuDGbEjsmgs5ub3GaI1Q== 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 4LnDlz4Z3rzFfq; Tue, 19 Jul 2022 09:57:51 +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 26J9vpcu013046; Tue, 19 Jul 2022 09:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J9vpnv013045; Tue, 19 Jul 2022 09:57:51 GMT (envelope-from git) Date: Tue, 19 Jul 2022 09:57:51 GMT Message-Id: <202207190957.26J9vpnv013045@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: f470bff421ff - stable/13 - lockstat: Fix construction of comparision predicates 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: kd X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f470bff421ffc5f0055086148740f4f564bf5fd6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658224671; 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=RG79YW8cWVC29gXaaVT/lNxPj+g8suc5RVW3oHDXDV4=; b=gn0rZH1kgLxwyXwCmMbvbqGo1YDTbGtaqVPMBG6ORRJCyIMUZT+M+uBgOooLkVLn3RFPtR WM0vTAuGBuIL0+WKLUdH/CufXDFW3GkDpcC08lG0OdQGyeINN5PuUVztXsq5VJK8t3ZD0W myG8P7JOGp+Aondqcq6nH5zoYzaBKiLKv7ZCRbISfYLEo2pElUNSEFPZKBUTXIgdZo+Opt TGYvF0XXfYBYgqaiy0nJH9i7pIjd/ieeprVq+h9tDeMxiY0LJLTUIPx+n8/yk7tTInstLS Gsg38OJ2IgoFxR5oEy1jjC4/4P5slV+ISQ6bYlVHbBhgrpyR9iF3NGHT53PRzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658224671; a=rsa-sha256; cv=none; b=J72/mnT+soxJBovYKbD1dmfqieAH80+5edsP+buR+EfhqYxjYAISDlKTGzyxTWMZanai8g bbp1uJPUL5m7s+d5qD7jeIKAE8T4AjOYRGCJZUR3bXrCiTFR0aiEzEXYqKw2zcu6RsKou0 h7vShE8BRZbH1bZ3yQPRSp4UIONFPc8m3ak3pGjP/5eBiNnQ0WVtwlPFMOJQVxtKBVhCyR A2eMzs/Ird7ohLAbx/BnHucM2YnsK+VfzaUu81FiTr9rD0PJTYNpPHqth1saNCUMxkLG5I ijfthDnhXOlN+sCrcdOFEmNziD19r0PduwO/4hCUvsUDMaWqvlwlhreRilXjZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=f470bff421ffc5f0055086148740f4f564bf5fd6 commit f470bff421ffc5f0055086148740f4f564bf5fd6 Author: Kornel Dulęba AuthorDate: 2022-07-04 06:48:52 +0000 Commit: Kornel Dulęba CommitDate: 2022-07-19 09:37:03 +0000 lockstat: Fix construction of comparision predicates Passing "0x%p" to sprintf results in double "0x" being printed. This causes a dtrace script compilation failure when "-d" flag is specified. Fix that by removing the extraneous "0x". Reviewed by: markj Approved by: mw(mentor) Obtained from: Semihalf Sponsored by: Alstom MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35690 (cherry picked from commit 9dbacce2d48abf04b4d65d2994586e1ff44b08fb) --- cddl/contrib/opensolaris/cmd/lockstat/lockstat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c index a7378980bc56..2fd29843b8ce 100644 --- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c +++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c @@ -606,14 +606,14 @@ predicate_add(char **pred, char *what, char *cmp, uintptr_t value) if (*pred[0] != '\0') { if (cmp != NULL) { - (void) sprintf(new, "(%s) && (%s %s 0x%p)", + (void) sprintf(new, "(%s) && (%s %s %p)", *pred, what, cmp, (void *)value); } else { (void) sprintf(new, "(%s) && (%s)", *pred, what); } } else { if (cmp != NULL) { - (void) sprintf(new, "%s %s 0x%p", + (void) sprintf(new, "%s %s %p", what, cmp, (void *)value); } else { (void) sprintf(new, "%s", what);