From 91e9c5ad08fa863d0124a051ad66d58cf4379deb94dbf9ebafcf823749767540 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 8 Sep 2019 16:18:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/filesystems/erofs-utils?expand=0&rev=11 --- long.patch | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/long.patch b/long.patch index 57ac9e4..a842372 100644 --- a/long.patch +++ b/long.patch @@ -1,4 +1,4 @@ -From d39cfe175f1bb7541d0d799a8d345b98aa61e170 Mon Sep 17 00:00:00 2001 +From 5c314e288719b59fb8bad90fd1a75b8076baceee Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 8 Sep 2019 16:52:56 +0200 Subject: [PATCH] build: cure compiler warnings @@ -17,36 +17,40 @@ inode.c:792:3: note: in expansion of macro 'erofs_info' inode.c:792:37: note: format string is defined here 792 | erofs_info("add file %s/%s (nid %lu, type %d)", --- - lib/compress.c | 2 +- - lib/inode.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + lib/compress.c | 4 ++-- + lib/inode.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/compress.c b/lib/compress.c -index a977c87..8d97e82 100644 +index a977c87..cadf598 100644 --- a/lib/compress.c +++ b/lib/compress.c -@@ -457,7 +457,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode) +@@ -457,8 +457,8 @@ 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, inode->i_size, compressed_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..a514303 100644 +index 141a300..db9ad99 100644 --- a/lib/inode.c +++ b/lib/inode.c -@@ -789,7 +789,7 @@ fail: +@@ -789,8 +789,8 @@ 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, d->nid, d->type); ++ dir->i_srcpath, d->name, (unsigned long long)d->nid, d->type); } erofs_write_dir_file(dir); + erofs_write_tail_end(dir); -- 2.23.0