[1/2] mtd-utils: Fix format specifier definitions for off_t and loff_t.

Submitted by Grant Likely on Feb. 11, 2017, 4:43 p.m.

Details

Message ID 1486831412-30409-2-git-send-email-torfl@t-online.de
State Accepted
Delegated to: David Oberhollenzer
Headers show

Commit Message

Grant Likely Feb. 11, 2017, 4:43 p.m.
From: Torsten Fleischer <torfl@t-online.de>

On 32bit systems (e.g. ARM) the size of off_t can be 4 byte and the size of loff_t 8 byte.

This causes compiler warnings like the following:

flash_erase.c: In function 'show_progress':
flash_erase.c:56:22: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 3 has type 'off_t {aka long int}' [-Wformat=]
  bareverbose(!quiet, "\rErasing %d Kibyte @ %"PRIxoff_t" -- %2i %% complete ",

and an output like this:

~# flash_erase /dev/mtd2 0 1
Erasing 64 Kibyte @ 6400000000 -- 0 % complete

~#

Since the size of off_t and loff_t can differ from each other, the
printf format specifier should be determined separately for both.
Further the format specifiers should be based directly on the size of the
particular data type.

Signed-off-by: Torsten Fleischer <torfl6749@gmail.com>
---
 configure.ac                   |  2 +-
 include/common.h               | 14 +++++++++-----
 tests/mtd-tests/nandpagetest.c |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/configure.ac b/configure.ac
index a5fc3a5..fbef15c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@  AM_COND_IF([WITHOUT_LZO], [], [
 	test "${have_lzo}" != "yes" && AC_MSG_ERROR([lzo missing])
 ])
 
-AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([off_t])
 
 AC_CHECK_SIZEOF([loff_t])
 
diff --git a/include/common.h b/include/common.h
index 2812f49..d0c706d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -70,17 +70,21 @@  extern "C" {
 #endif
 
 /* define a print format specifier for off_t */
-#ifdef __USE_FILE_OFFSET64
+#if (SIZEOF_OFF_T >= 8)
 #define PRIxoff_t PRIx64
 #define PRIdoff_t PRId64
 #else
-#if (SIZEOF_LONG == SIZEOF_LOFF_T)
 #define PRIxoff_t "l"PRIx32
 #define PRIdoff_t "l"PRId32
-#else
-#define PRIxoff_t "ll"PRIx32
-#define PRIdoff_t "ll"PRId32
 #endif
+
+/* define a print format specifier for loff_t */
+#if (SIZEOF_LOFF_T >= 8)
+#define PRIxloff_t PRIx64
+#define PRIdloff_t PRId64
+#else
+#define PRIxloff_t "l"PRIx32
+#define PRIdloff_t "l"PRId32
 #endif
 
 /* Verbose messages */
diff --git a/tests/mtd-tests/nandpagetest.c b/tests/mtd-tests/nandpagetest.c
index faf5fe3..4145ef7 100644
--- a/tests/mtd-tests/nandpagetest.c
+++ b/tests/mtd-tests/nandpagetest.c
@@ -230,7 +230,7 @@  static int verify_eraseblock(int ebnum)
 			return err;
 
 		if (lseek(fd, addr, SEEK_SET) != addr) {
-			fprintf(stderr, "cannot seek mtd%d to offset %"PRIdoff_t,
+			fprintf(stderr, "cannot seek mtd%d to offset %"PRIdloff_t,
 	 				mtd.mtd_num, addr);
 			return -1;
 		}