From nobody Thu Jul 18 14:54:56 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 4WPwns0mSFz5RYvc; Thu, 18 Jul 2024 14:54: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WPwns0GCGz4Cgp; Thu, 18 Jul 2024 14:54:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721314497; 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=3R8ozw3e7g//YUFlQUunk+1PryIZ+tnkPgpy3hGaVgs=; b=u6hIQeb1KNrwEYsKk7Delc04VJAzMfTVplKuTAhMiatSDkZf/VUkI4iGEbGjNNpRhHWK0S m/Cd3TURHo7Ma8SVxH5SpUCugSA7Xhx/14BqTBCnl5Gl3mv1l8k5Z7IYHEplRuLWHb1ZO0 CiNlGxk8hElLl6qi5SKeSOqZfmAcYQfmpCfVBrVxbqiTUh+2e+MdQtanpHh+RFzAIBbXBG /oGTwgM1a1GsM29PTU6Pq6t9TCP2TigwHv7/2Nh37HTHtEjvL4jRLs+GsiBN2nWdKnDUkB UzgVj8BqIcMoFaiyTgclGYnXkG9kfggGaUDFRGYNnzZLNjFFbMu1IZySlW/Nlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721314497; a=rsa-sha256; cv=none; b=IPMLm1SQJfwkhJp5hSRUerGL+LUTdflWuO9RBAk8hiUGO7DRCkIdWdoAUzWYWCUX9beyED /I0ocX/O+FqnkdYc7ZtKcfWbHywIgMkUsEOYR99Eb5sda9aYMGeNsGZrXTL92YTPHqtq1v ezY4Th7nJ1vVi7USsOJFALIQ49WK/MhUGLLYOXJxDv/38eD6/Qzt5l1eZcKFQzw1wdPoiO V/Lyk2wJcI2tub+Kjde+PnQM81aCCfdSzsBQ17VY1DFCAxCLrGq6ScWpipr/cA+ecRGfM6 nPYO3wyjXIj5j4NC4xnzB3PWNP4D9a95P8YLA5A5bYK49zoq8ddqlwAxNuP+Zw== 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=1721314497; 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=3R8ozw3e7g//YUFlQUunk+1PryIZ+tnkPgpy3hGaVgs=; b=HBVRsjXFJC2B0SpiKMXWon+q/BkaqsadNCWeM2pErpvdgLYTc6xHGBzftz1SaRwbDCi8MX oX3Wi73kMlNIL4rKLm9Zy04uitAJswWTHNCabOdhSduv2lLB5l6km3LLqDJNyOEGRzCDLi 1w0Enj2AGsJINWRi281CPzY9pDuU1SN0EJr712m1q2WAO5/xIo+n+hTPrpRmNOcytFZG0E 0YmCk5Js7R6gLwXbRY9tNuJNTAdphrLkHIMgXnvUxENGgmR8Phrz2Jp6riS2ISnzjz+ycU lUAIcUByTS0/8PzQ1pz+e7JSRK1YPoiIpDlgnAIxM1x8FArbfyE7hwJreh6Q2Q== 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 4WPwnr707Qzsxh; Thu, 18 Jul 2024 14:54:56 +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 46IEsuZJ022072; Thu, 18 Jul 2024 14:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46IEsuUJ022069; Thu, 18 Jul 2024 14:54:56 GMT (envelope-from git) Date: Thu, 18 Jul 2024 14:54:56 GMT Message-Id: <202407181454.46IEsuUJ022069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f029f6277996 - main - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f029f6277996760be4be42148295231af425cc2d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f029f6277996760be4be42148295231af425cc2d commit f029f6277996760be4be42148295231af425cc2d Author: Mark Johnston AuthorDate: 2024-07-18 14:52:52 +0000 Commit: Mark Johnston CommitDate: 2024-07-18 14:52:52 +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)") --- 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 f55c7f7b8176..6063dc3b7cd3 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -1131,8 +1131,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);