git: b5ce60dffd5d - stable/14 - zdb: Fix printf formatting of a uint64_t
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 15 Aug 2024 14:44:13 UTC
The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ce60dffd5d50c1d79561e1616c9463d8c081b4 commit b5ce60dffd5d50c1d79561e1616c9463d8c081b4 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2024-07-18 14:52:52 +0000 Commit: Martin Matuska <mm@FreeBSD.org> 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);