From nobody Tue Jan 28 15:11:57 2025 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 4Yj7zx41yYz5lbTk; Tue, 28 Jan 2025 15:11: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 4Yj7zx3GNjz3gKm; Tue, 28 Jan 2025 15:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077117; 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=7Whx825c78O5M+l6KIxASblFvDeDf4U2h5WZ6hpZ7Mo=; b=b5eaxlYHhCBJnTeActiUMmXn/XUHL3FMpfHY/8iJiGJG6BAlRL3I/Cx6gCAA42nAQIer8f 1YQwVHQLbXeSP9V4Xp+O8Ot9J+QGRo/vQ1C6qqUcLPC6UrRUq1jx5dGvZwfLfYDtDr0zGG up73vfSVr/4ygLJxg/webQPbm7KtEzR9E1qr4IMK7kp7KAdRr6sIPoeoeOT3RI2BEYF7GK BDbo6ZtOPryWOJGH39aXZ56VchrDSVkXUPNg/BgIT+Se9tgjOZJogoPPX97RXI7wfrwSZ8 yKKd8W0shL7WCpA7IbN36eRT/mX7sR8yCNb0qm1fGWnAc476wHQv/sHGj81vYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738077117; 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=7Whx825c78O5M+l6KIxASblFvDeDf4U2h5WZ6hpZ7Mo=; b=Wj4IBBIuuUJ8Av/jtPN6t1yNzB0mYupBlMdZZS1XIs346++i0eI1U4+7FjApJ4mk5i3pkC gdY7+wpcf9gp/iEyVboVfq4r6rqGZ06Ya1nCvtAn0z7GH0svuStEGyfOdlpHuvtAMFmrXO d6zYAJxrI9Vp/m/M45NDIFRjQezBG0AuyC6TYFpE9Cv55+Cd9VmdQvbImp1yuklAWj8cCW 7RzPR2GdedjzWycpRxN9Xxe/P8555Mv5tkLUTIfslpLVstJG7pPdeCP1TdZ46ANyA/v/VJ /dPpsO9m3A4VMexisYcl+izys2VuSKBuIa4R0Ghv6U7TjadJ4U4hFulN1+8wbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738077117; a=rsa-sha256; cv=none; b=mHbYirzeA3XKQATMF/cjqT6kJjinJkczqxUR6zzpMJIM1Sz9G600VVtLD5BJoUX0CpvRDV 4nWna276qVsdQBYwJOc5lZ00i52OuwiAMeprlWGYG/x8Mmp2SusHu0WOMnX0Lz2urI+2Db 62vLix6B66NcBjPo8TwDrHu1mE9sWvPOhk1o/WkK98O8Ou8Qlz4Okj4cNdeYn8gJ4KWA+0 9nvh9TU2XfXSThbltzYrT2DZX8g89uRnjrf7uA7RVKeuNwirNesL+dCaYjmOlnIc2znllu Q2NdC6+YGnlgB0OYl4Xu4FJx40cMVYWkmHNXl3YJFYL8ZgwZzsoy5/hVq6n9NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yj7zx2t2Fz4Zq; Tue, 28 Jan 2025 15:11:57 +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 50SFBvUK047254; Tue, 28 Jan 2025 15:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SFBv2k047251; Tue, 28 Jan 2025 15:11:57 GMT (envelope-from git) Date: Tue, 28 Jan 2025 15:11:57 GMT Message-Id: <202501281511.50SFBv2k047251@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: 5289625dfecb - main - zinject: Fix format string errors on 32-bit platforms 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: 5289625dfecb962e0410dfafc403aced3b9a2e4b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5289625dfecb962e0410dfafc403aced3b9a2e4b commit 5289625dfecb962e0410dfafc403aced3b9a2e4b Author: Mark Johnston AuthorDate: 2025-01-28 15:11:24 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 15:11:24 +0000 zinject: Fix format string errors on 32-bit platforms Fixes: c6767dc1f236 ("zfs: merge openzfs/zfs@34205715e") --- sys/contrib/openzfs/cmd/zinject/zinject.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/contrib/openzfs/cmd/zinject/zinject.c b/sys/contrib/openzfs/cmd/zinject/zinject.c index 4374e69a7f94..459daa727d77 100644 --- a/sys/contrib/openzfs/cmd/zinject/zinject.c +++ b/sys/contrib/openzfs/cmd/zinject/zinject.c @@ -453,10 +453,11 @@ print_data_handler(int id, const char *pool, zinject_record_t *record, (void) printf("%3d %-15s %-6llu %-6llu %-8s %-3d 0x%02x %-15s " - "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_objset, + "%6llu %6llu\n", id, pool, (u_longlong_t)record->zi_objset, (u_longlong_t)record->zi_object, type_to_name(record->zi_type), record->zi_level, record->zi_dvas, rangebuf, - record->zi_match_count, record->zi_inject_count); + (u_longlong_t)record->zi_match_count, + (u_longlong_t)record->zi_inject_count); return (0); } @@ -490,9 +491,10 @@ print_device_handler(int id, const char *pool, zinject_record_t *record, (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f; (void) printf("%3d %-15s %llx %-5s %-10s %8.4f%% " - "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid, + "%6llu %6llu\n", id, pool, (u_longlong_t)record->zi_guid, iotype_to_str(record->zi_iotype), err_to_str(record->zi_error), - freq, record->zi_match_count, record->zi_inject_count); + freq, (u_longlong_t)record->zi_match_count, + (u_longlong_t)record->zi_inject_count); return (0); } @@ -525,10 +527,11 @@ print_delay_handler(int id, const char *pool, zinject_record_t *record, (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f; (void) printf("%3d %-15s %llx %10llu %5llu %8.4f%% " - "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid, + "%6llu %6llu\n", id, pool, (u_longlong_t)record->zi_guid, (u_longlong_t)NSEC2MSEC(record->zi_timer), - (u_longlong_t)record->zi_nlanes, - freq, record->zi_match_count, record->zi_inject_count); + (u_longlong_t)record->zi_nlanes, freq, + (u_longlong_t)record->zi_match_count, + (u_longlong_t)record->zi_inject_count); return (0); }