Use <inttypes.h> PRI macros instead of %qd / %llu.

diff --git a/fsck_hfs/dfalib/CatalogCheck.c b/fsck_hfs/dfalib/CatalogCheck.c
index ae0c983469d8035a37e7167bdd57c9c2a431f678..5e3dd1668062fb6f3220b9ced402f4b19bd117b3 100644 (file)
--- a/fsck_hfs/dfalib/CatalogCheck.c
+++ b/fsck_hfs/dfalib/CatalogCheck.c
@@ -1771,8 +1771,8 @@ RecordTruncation(UInt32 parID, unsigned char * filename, UInt32 forkType, UInt64
        } else {
                fsckPrint(gScavGlobals->context, E_LEOF, filename);
        }
        } else {
                fsckPrint(gScavGlobals->context, E_LEOF, filename);
        }

-       sprintf(oldSizeStr, "%qd", oldSize);
-       sprintf(newSizeStr, "%qd", newSize);
+       sprintf(oldSizeStr, "%"PRId64"", oldSize);
+       sprintf(newSizeStr, "%"PRId64"", newSize);

        fsckPrint(gScavGlobals->context, E_BadValue, newSizeStr, oldSizeStr);
 
        /* Only HFS+ is repaired here */
        fsckPrint(gScavGlobals->context, E_BadValue, newSizeStr, oldSizeStr);
 
        /* Only HFS+ is repaired here */

diff --git a/fsck_hfs/dfalib/fsck_journal.c b/fsck_hfs/dfalib/fsck_journal.c
index fa93f99bde86a772886bc85b8e2a242bd335c50a..8f9f8a2367f9d3c0df44a3fdb91ce7e87c160eb8 100644 (file)
--- a/fsck_hfs/dfalib/fsck_journal.c
+++ b/fsck_hfs/dfalib/fsck_journal.c
@@ -142,7 +142,7 @@ journalRead(JournalIOInfo_t *info, uint8_t *buffer, size_t length)
 
                n = pread(info->jfd, ptr, amt, info->current);
                if (n == -1) {
 
                n = pread(info->jfd, ptr, amt, info->current);
                if (n == -1) {

-                       warn("pread(%d, %p, %zu, %llu)", info->jfd, ptr, amt, info->current);
+                       warn("pread(%d, %p, %zu, %"PRIu64")", info->jfd, ptr, amt, info->current);

                        goto done;
                }
                if (n != amt) {
                        goto done;
                }
                if (n != amt) {