From 64667fe63ba9dd78adb9c4abf04bc3e4e25a0fd7 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 21 Sep 2018 01:22:11 +0200 Subject: mtd-utils: Instead of doing preprocessor magic, just output off_t as long long Fix warnings abot PRIdoff_t in libmtd.c, in mtd_read (and mtd_write): In file included from ../git/lib/libmtd.c:40:0: ../git/lib/libmtd.c: In function 'mtd_read': ../git/include/common.h:110:18: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'off_t {aka long long int}' [-Wformat=] ../git/include/common.h:120:2: note: in expansion of macro 'errmsg' errmsg(fmt, ##__VA_ARGS__); \ ^~~~~~ ../git/lib/libmtd.c:1082:10: note: in expansion of macro 'sys_errmsg' return sys_errmsg("cannot seek mtd%d to offset %"PRIdoff_t, ^~~~~~~~~~ /usr/lib/klibc/include/inttypes.h:28:17: note: format string is defined here #define PRId32 "d" Signed-off-by: Thorsten Glaser Signed-off-by: David Oberhollenzer --- misc-utils/flash_erase.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'misc-utils/flash_erase.c') diff --git a/misc-utils/flash_erase.c b/misc-utils/flash_erase.c index e7a00ae..a7fc6a6 100644 --- a/misc-utils/flash_erase.c +++ b/misc-utils/flash_erase.c @@ -53,8 +53,8 @@ int target_endian = __BYTE_ORDER; static void show_progress(struct mtd_dev_info *mtd, off_t start, int eb, int eb_start, int eb_cnt) { - bareverbose(!quiet, "\rErasing %d Kibyte @ %"PRIxoff_t" -- %2i %% complete ", - mtd->eb_size / 1024, start, ((eb - eb_start) * 100) / eb_cnt); + bareverbose(!quiet, "\rErasing %d Kibyte @ %llx -- %2i %% complete ", + mtd->eb_size / 1024, (unsigned long long)start, ((eb - eb_start) * 100) / eb_cnt); fflush(stdout); } @@ -211,7 +211,7 @@ int main(int argc, char *argv[]) if (!noskipbad) { int ret = mtd_is_bad(&mtd, fd, eb); if (ret > 0) { - verbose(!quiet, "Skipping bad block at %08"PRIxoff_t, offset); + verbose(!quiet, "Skipping bad block at %08llx", (unsigned long long)offset); continue; } else if (ret < 0) { if (errno == EOPNOTSUPP) { -- cgit v1.2.3