git: 5289625dfecb - main - zinject: Fix format string errors on 32-bit platforms

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5289625dfecb962e0410dfafc403aced3b9a2e4b

commit 5289625dfecb962e0410dfafc403aced3b9a2e4b
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-01-28 15:11:24 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
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);
 }