From nobody Thu Aug 15 14:44:13 2024 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 4Wl7DZ0MsXz5SHRx; Thu, 15 Aug 2024 14:44:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl7DY6h0sz4QCT; Thu, 15 Aug 2024 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723733053; 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=68gN9Jdy4dxoyb2rtzCdtJfPd+1ZoxK9AywbaCp5vXs=; b=oF87ANERFWYPpQ/FCQQvGG45KUxInFVJRePDMSFfSkPpNoILMUpkqHIReAF+9+HxWGuTkl Xh4nV+WzNe+DPwDcxD8er1ZJoWGvNdUrC9Fdaryyod9qRIYJrr4r8Y2NTtaLGZXq/gsw/E jW8G4Otd11CU621L0CjXH2EVybB1nSimGvIkae2iSwSLFXjNLNTRkbQQZe5aEJcwF7BKe8 IaxK10v3zD3UupHcFt73/1pDIWVlq7SnFm+vU8/CJ1HMvyf4raik+iTRmgYYZwzfflQvV/ MlybOkDDi+EZf9pA7TuGMYmUYL9RWgCxEFHK7JXlCRvKxJzLhih+7CzgCja3pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723733053; a=rsa-sha256; cv=none; b=ZM39iloF482hMU0aZ1NdKjTbJWCFe/dnmNgR+A5pjSLQAQoK5BJmx2EU0Uwc5S7wAML4UK r2HNoZgDJYK5F2BNFbJ3c5YPL4NGrlssZ0/gMH+psx+dKILUqUKQ+4SLXdVQYCobPw8KIh 1WwWfF1k6xPQ7Fa7gV9kfhWhD2Ncji1Ov5tb4/xX3EJ0hAQJzQCgG/sMJatB/dErPUeO6I lYc5ruBSMxseCjA/DO2rKbpyk5McYr59XF/BQy4Xw/8Wh3ENZF+VK1LcOo08vbp3As+TMQ kN/MteDVg1EknVOxrfruIafJXgy46NhQ40qcJ73U1Nk+E57cWGzgVwdJFS8JaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723733053; 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=68gN9Jdy4dxoyb2rtzCdtJfPd+1ZoxK9AywbaCp5vXs=; b=UPE1HdKdX5aJ0ZnJheToQwhGD0HAq6RaGZ75IdIatiMPZo8twu8cQmeDH8wV64jlxBOLTE CMTk0Qletv0OeMQiwiCObHjjtCfPXDIxSpfv8qMztOR1D+VIvreuPkJH0tyNp+bl1iBxNh WAqhMIYEoqXc+nJYRtZtRqnWNWqw6quSMpgqtaj/+FGV1Ygn1L+YDsJwBmcips6YrC5aWl NRyb211M1/ML0bLy1U3AWatQ4w7hcnfEiiq78rRCvdbWTkvEaGQGvxnoE5xc5i7uvSYNRY RBM9JwadS64xvROSNvC1+xtrARP59ivhk2QYrJT3n9pZl/FF8PPid3G7x6vMPQ== 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 4Wl7DY6HKtzRYs; Thu, 15 Aug 2024 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FEiDwh050063; Thu, 15 Aug 2024 14:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FEiDwe050060; Thu, 15 Aug 2024 14:44:13 GMT (envelope-from git) Date: Thu, 15 Aug 2024 14:44:13 GMT Message-Id: <202408151444.47FEiDwe050060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: b5ce60dffd5d - stable/14 - zdb: Fix printf formatting of a uint64_t 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5ce60dffd5d50c1d79561e1616c9463d8c081b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ce60dffd5d50c1d79561e1616c9463d8c081b4 commit b5ce60dffd5d50c1d79561e1616c9463d8c081b4 Author: Mark Johnston AuthorDate: 2024-07-18 14:52:52 +0000 Commit: Martin Matuska CommitDate: 2024-08-15 14:44:48 +0000 zdb: Fix printf formatting of a uint64_t This fixes the build on 32-bit platforms. Fixes: dc91e7452482 ("zdb: dump ZAP_FLAG_UINT64_KEY ZAPs properly (#16334)") (cherry picked from commit f029f6277996760be4be42148295231af425cc2d) --- sys/contrib/openzfs/cmd/zdb/zdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c index 2caa83f5c636..609e2c707b4b 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -1237,8 +1237,8 @@ dump_zap(objset_t *os, uint64_t object, void *data, size_t size) !!(zap_getflags(zc.zc_zap) & ZAP_FLAG_UINT64_KEY); if (key64) - (void) printf("\t\t0x%010lx = ", - *(uint64_t *)attr.za_name); + (void) printf("\t\t0x%010llx = ", + (u_longlong_t)*(uint64_t *)attr.za_name); else (void) printf("\t\t%s = ", attr.za_name);