[src/trunk]: src/sbin/fsck_udf Use PRI macros for uint64_t printf formats, %z...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b00a5364f702
branches:  trunk
changeset: 364693:b00a5364f702
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 06 16:01:06 2022 +0000

description:
Use PRI macros for uint64_t printf formats, %zu for size_t.

diffstat:

 sbin/fsck_udf/main.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 7cd51a38d608 -r b00a5364f702 sbin/fsck_udf/main.c
--- a/sbin/fsck_udf/main.c      Wed Apr 06 14:47:54 2022 +0000
+++ b/sbin/fsck_udf/main.c      Wed Apr 06 16:01:06 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.2 2022/04/06 13:42:39 wiz Exp $     */
+/*     $NetBSD: main.c,v 1.3 2022/04/06 16:01:06 martin Exp $  */
 
 /*
  * Copyright (c) 2022 Reinoud Zandijk
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.2 2022/04/06 13:42:39 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.3 2022/04/06 16:01:06 martin Exp $");
 #endif /* not lint */
 
 #include <stdio.h>
@@ -520,7 +520,7 @@
        }
 
        if (sfpos != dfpos)
-               printf("%s: could save %ld bytes in directory\n", udf_node_path(node), sfpos - dfpos);
+               printf("%s: could save %" PRIi64 " bytes in directory\n", udf_node_path(node), sfpos - dfpos);
 
        memset(directory, 0, inf_len);
        memcpy(directory, rebuild_dir, dfpos);
@@ -2985,7 +2985,7 @@
 
        /* check our highest unique id */
        if (context.unique_id > udf_rw64(lvid->lvint_next_unique_id)) {
-               pwarn("Last unique id updated from %ld to %ld : FIXED\n",
+               pwarn("Last unique id updated from %" PRIi64 " to %" PRIi64 " : FIXED\n",
                                udf_rw64(lvid->lvint_next_unique_id),
                                context.unique_id);
                open_integrity = 1;
@@ -3299,7 +3299,7 @@
        diff = node->found.inf_len - node->declared.inf_len;
        if (diff) {
                pwarn("%s : recorded information length incorrect: "
-                       "%lu instead of declared %lu\n",
+                       "%" PRIu64 " instead of declared %" PRIu64 "\n",
                        udf_node_path(node),
                        node->found.inf_len, node->declared.inf_len);
                        node->declared.inf_len = node->found.inf_len;
@@ -3311,7 +3311,7 @@
        diff = node->found.logblks_rec - node->declared.logblks_rec;
        if (diff) {
                pwarn("%s : logical blocks recorded incorrect: "
-                     "%lu instead of declared %lu, fixing\n",
+                     "%" PRIu64 " instead of declared %" PRIu64 ", fixing\n",
                        udf_node_path(node),
                        node->found.logblks_rec, node->declared.logblks_rec);
                node->declared.logblks_rec = node->found.logblks_rec;
@@ -3332,7 +3332,7 @@
        if (udf_rw16(dscr->tag.desc_crc_len) !=
                        udf_tagsize(dscr, 1) - sizeof(struct desc_tag)) {
                pwarn("%s : node file descriptor CRC length mismatch; "
-                       "%d declared, %ld expected\n",
+                       "%d declared, %zu\n",
                        udf_node_path(node), udf_rw16(dscr->tag.desc_crc_len),
                        udf_tagsize(dscr, 1) - sizeof(struct desc_tag));
                udf_recursive_keep(node);
@@ -4020,7 +4020,7 @@
                /* object sizes */
                if (cur_node->declared.obj_size != cur_node->found.obj_size) {
                        pwarn("%s : recorded object size incorrect; "
-                             "%lu instead of declared %lu\n",
+                             "%" PRIu64 " instead of declared %" PRIu64 "\n",
                                udf_node_path(cur_node),
                                cur_node->found.obj_size, cur_node->declared.obj_size);
                        cur_node->declared.obj_size = cur_node->found.obj_size;