Fix printf format specifiers for 64 bit integer types

In nandflipbits, nandtest and ubiscan, uint64_t integers are printed
to stdout using "%llu" as a format specifier, but on platforms like
x86_64, uint64_t is actually typedef'd as `unsigned long` only.

For compatibillity across platforms, simply use the C99 printfs
macros instead.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

3 files changed, 10 insertions, 6 deletions

diff --git a/nand-utils/nandflipbits.c b/nand-utils/nandflipbits.c
index cd66d0b..7066408 100644
--- a/nand-utils/nandflipbits.c
+++ b/nand-utils/nandflipbits.c
@@ -203,7 +203,8 @@ int main(int argc, char **argv)
 		int page;
 
 		if (bits_to_flip[i].offset >= mtdlen) {
-			fprintf(stderr, "Invalid byte offset %lld (max %lld)\n",
+			fprintf(stderr, "Invalid byte offset %" PRId64
+				" (max %" PRId64 ")\n",
 				bits_to_flip[i].offset, mtdlen);
 			ret = EXIT_FAILURE;
 			goto free_buf;
diff --git a/nand-utils/nandtest.c b/nand-utils/nandtest.c
index 14dfbff..cac0dde 100644
--- a/nand-utils/nandtest.c
+++ b/nand-utils/nandtest.c
@@ -266,17 +266,20 @@ int main(int argc, char **argv)
 		length = mem_size;
 
 	if (offset % meminfo.erasesize) {
-		fprintf(stderr, "Offset %llx not multiple of erase size %x\n",
+		fprintf(stderr, "Offset %" PRIx64
+			" not multiple of erase size %x\n",
 			offset, meminfo.erasesize);
 		exit(1);
 	}
 	if (length % meminfo.erasesize) {
-		fprintf(stderr, "Length %llx not multiple of erase size %x\n",
+		fprintf(stderr, "Length %" PRIx64
+			" not multiple of erase size %x\n",
 			length, meminfo.erasesize);
 		exit(1);
 	}
 	if (length + offset > mem_size) {
-		fprintf(stderr, "Length %llx + offset %llx exceeds device size %llx\n",
+		fprintf(stderr, "Length %" PRIx64 " + offset %" PRIx64
+			" exceeds device size %" PRIx64 "\n",
 			length, offset, mem_size);
 		exit(1);
 	}
diff --git a/ubi-utils/ubiscan.c b/ubi-utils/ubiscan.c
index e040bab..66af12a 100644
--- a/ubi-utils/ubiscan.c
+++ b/ubi-utils/ubiscan.c
@@ -264,10 +264,10 @@ int main(int argc, char * const argv[])
 
         int from = (j == 0) ? 0 : args.bin_thresholds[j - 1];
         if (j == args.nbins - 1)
-            printf("%-8d ..      inf: %8d %8d %8llu %8d\n",
+            printf("%-8d ..      inf: %8d %8d %8" PRIu64 " %8d\n",
                 from, bins[j].cnt, bins[j].min, bins[j].mean, bins[j].max);
         else
-            printf("%-8d .. %8d: %8d %8d %8llu %8d\n",
+            printf("%-8d .. %8d: %8d %8d %8" PRIu64 " %8d\n",
                 from, args.bin_thresholds[j] - 1,
                 bins[j].cnt, bins[j].min, bins[j].mean, bins[j].max);
     }