From nobody Mon Jul 04 14:25:12 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 D331B830154; Mon, 4 Jul 2022 14:25:13 +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 4Lc7PP4z3Cz3M13; Mon, 4 Jul 2022 14:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656944713; 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=80+GYlJ0pnLlrD4yd+TTWfRmZM0td7Cnd4q/J8OS/9s=; b=oLTrya2S7Eh/t3DCvaODx1ucBS7TO64YmIeD0s8ngJeanyac8vqah2Q1J2cxuuUNmRkB99 7Avg5SnUoZEk3b3DlJgBjezy/mO8X439fKLtpZbaJPAlYZAuf/9e+y5IZO1cf2oXY5Efvk 03A4bUj3Sgx0ybgykD3M29fcaOqV7XRI85RynkrQ+r3OP1usOaWy09NPso3a/+rb6hxGK9 Jg+ql36fbWlaJQ7aIv1Uj+sLNuDwiZ8v2BxTw0/oRydRSJpaOk1YuGWGhVjgRnI4o6yBjx LEy648Tcysblkb0OfpXDcuwpWMe1dBLS0pfGaiH84qYao3/ZLCyJEnKdMnqwcw== 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 3902112865; Mon, 4 Jul 2022 14:25:13 +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 264EPCLf064110; Mon, 4 Jul 2022 14:25:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264EPCAh064109; Mon, 4 Jul 2022 14:25:12 GMT (envelope-from git) Date: Mon, 4 Jul 2022 14:25:12 GMT Message-Id: <202207041425.264EPCAh064109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 9dbacce2d48a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9dbacce2d48abf04b4d65d2994586e1ff44b08fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656944713; 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=80+GYlJ0pnLlrD4yd+TTWfRmZM0td7Cnd4q/J8OS/9s=; b=KWBSqeY3aeuRWWs/6F7mLKaBgeSpLbkFUbCvh6rNBGdVaWGvdFdcOvGdrnPXieEdgDlvHH H4QopBH/7lvuQXa0sxdLJQZLRnTtHyE97Mwo3LMzPorTaUJjfS5AVE+6PH66qqd+gnf1Ez ETTPLASamkkL+MTeq0QbSfmwLOmFxrlsWDHjmu/zaXchyixC9hHXQGzt/vQjiU4VrlfxZQ +8awYC1LRR0NzIZyj3vfUG693LxnfmMk61DXnpyxW4cy3Y+9ZszLd//vwtQ0TfljtMovOs kptxON3uL4GTsVJNJdIoEVk8LBJaEq5QEMET2vgJDXZhyse55gUNr/YI9Fzevg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656944713; a=rsa-sha256; cv=none; b=ch6bpb039PD9dypJ5FGYiBCEScpSom/fiXATaothAbAafpf4yXWx1yXMG/yaFyFTdmt5GO dNeNr3RQCPAuvE6yvhniKgoIPCSE0tYoHc6ueXNKAXqEesjSsYDZDLpDDf/jYbmm5oiMkT eROm3PcU0uYz3Kf7Rvmp8Ppy8JZ1tV1YwcNwH7JrhDpq7rSwXs87L9d4O9mky4aKdMYyIK BOe6Lw1GuzhS07Xyt8QpO1GBA6kHpLJNLxzseB3CRSSdKyPn2i+KSGHxqHZWlSESbRmERk e/UcUzuqe+O69cNyxcJZLOpanyOJjaaFDfZ6NpJNVy3RliBKOHU8R2V7SOUVfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=9dbacce2d48abf04b4d65d2994586e1ff44b08fb commit 9dbacce2d48abf04b4d65d2994586e1ff44b08fb Author: Kornel Dulęba AuthorDate: 2022-07-04 06:48:52 +0000 Commit: Kornel Dulęba CommitDate: 2022-07-04 14:22:22 +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 --- 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);