diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2019-09-08 23:48:21 +0200 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@aol.com> | 2019-09-09 07:44:21 +0800 |
| commit | 1530200afd95d4e39f43a02105ee35032ee2a10b (patch) | |
| tree | 2eab42f54c734c03e554d3bc10a091457e50407e | |
| parent | 3d45c540d24c38aed7ff916000a1c5f5fd282f5c (diff) | |
erofs-utils: build: cure compiler warnings
On i586 I observe:
In file included from inode.c:16:
inode.c: In function 'erofs_mkfs_build_tree':
../include/erofs/print.h:27:21: error: format '%lu' expects argument of type
'long unsigned int', but argument 7 has type 'erofs_nid_t' {aka 'long long unsigned int'} [-Werror=format=]
27 | #define pr_fmt(fmt) "EROFS: " FUNC_LINE_FMT fmt "\n"
../include/erofs/print.h:43:4: note: in expansion of macro 'pr_fmt'
43 | pr_fmt(fmt), \
inode.c:792:3: note: in expansion of macro 'erofs_info'
792 | erofs_info("add file %s/%s (nid %lu, type %d)",
inode.c:792:37: note: format string is defined here
792 | erofs_info("add file %s/%s (nid %lu, type %d)",
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
[ Gao Xiang: minor update, and fix subject line. ]
Signed-off-by: Gao Xiang <hsiangkao@aol.com>
| -rw-r--r-- | lib/compress.c | 5 | ||||
| -rw-r--r-- | lib/inode.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/compress.c b/lib/compress.c index a977c87..1919609 100644 --- a/lib/compress.c +++ b/lib/compress.c @@ -457,8 +457,9 @@ int erofs_write_compressed_file(struct erofs_inode *inode) ret = erofs_bh_balloon(bh, blknr_to_addr(compressed_blocks)); DBG_BUGON(ret); - erofs_info("compressed %s (%lu bytes) into %u blocks", - inode->i_srcpath, inode->i_size, compressed_blocks); + erofs_info("compressed %s (%llu bytes) into %u blocks", + inode->i_srcpath, (unsigned long long)inode->i_size, + compressed_blocks); /* * TODO: need to move erofs_bdrop to erofs_write_tail_end diff --git a/lib/inode.c b/lib/inode.c index 141a300..e3495f4 100644 --- a/lib/inode.c +++ b/lib/inode.c @@ -789,8 +789,9 @@ fail: d->type = erofs_type_by_mode[d->inode->i_mode >> S_SHIFT]; erofs_d_invalidate(d); - erofs_info("add file %s/%s (nid %lu, type %d)", - dir->i_srcpath, d->name, d->nid, d->type); + erofs_info("add file %s/%s (nid %llu, type %d)", + dir->i_srcpath, d->name, (unsigned long long)d->nid, + d->type); } erofs_write_dir_file(dir); erofs_write_tail_end(dir); |