[PATCH] erofs-utils: dump: fix format errors on some architectures
David Michael
fedora.dm0 at gmail.com
Mon Nov 22 09:23:26 AEDT 2021
This applies the same type casting to nid values as is done in the
other formatting function calls to avoid this error:
In file included from main.c:11:
main.c: In function 'erofs_checkdirent':
../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=]
68 | "<E> " PR_FMT_FUNC_LINE(fmt), \
| ^~~~~~
main.c:264:17: note: in expansion of macro 'erofs_err'
264 | erofs_err("invalid file type %llu", de->nid);
| ^~~~~~~~~
main.c: In function 'erofs_read_dirent':
../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=]
68 | "<E> " PR_FMT_FUNC_LINE(fmt), \
| ^~~~~~
main.c:303:25: note: in expansion of macro 'erofs_err'
303 | erofs_err("parse dir nid %llu error occurred\n",
| ^~~~~~~~~
cc1: all warnings being treated as errors
Signed-off-by: David Michael <fedora.dm0 at gmail.com>
---
Hi,
I hit this build failure on powerpc64le when trying the 1.4 release.
Can something like this be applied to get around it?
Thanks.
David
dump/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dump/main.c b/dump/main.c
index b7560ec..6f5b9e7 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -261,7 +261,7 @@ static inline int erofs_checkdirent(struct erofs_dirent *de,
return -EFSCORRUPTED;
}
if (de->file_type >= EROFS_FT_MAX) {
- erofs_err("invalid file type %llu", de->nid);
+ erofs_err("invalid file type %llu", de->nid | 0ULL);
return -EFSCORRUPTED;
}
return dname_len;
@@ -301,7 +301,7 @@ static int erofs_read_dirent(struct erofs_dirent *de,
err = erofs_read_dir(de->nid, nid);
if (err) {
erofs_err("parse dir nid %llu error occurred\n",
- de->nid);
+ de->nid | 0ULL);
return err;
}
}
--
2.31.1
More information about the Linux-erofs
mailing list