From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Mon, 16 Dec 2013 12:42:20 +0000 (-0800)
Subject: Use <inttypes.h> PRI macros instead of %qd / %llu.
X-Git-Url: https://git.saurik.com/hfs.git/commitdiff_plain/5561f477cf3053146a44daf2df3dd0698a1be641

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

diff --git a/fsck_hfs/dfalib/CatalogCheck.c b/fsck_hfs/dfalib/CatalogCheck.c
index ae0c983..5e3dd16 100644
--- 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);
 	}
-	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 */
diff --git a/fsck_hfs/dfalib/fsck_journal.c b/fsck_hfs/dfalib/fsck_journal.c
index fa93f99..8f9f8a2 100644
--- 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) {
-			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) {