jengelh/erofs-utils
SHA256
1
0
Fork 1
forked from pool/erofs-utils
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/filesystems/erofs-utils?expand=0&rev=11

Browse Source
This commit is contained in:
Jan Engelhardt 2019-09-08 16:18:25 +00:00 committed by Git OBS Bridge
parent 94a87d5e83
commit 91e9c5ad08
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
long.patch
View File

@ -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 <jengelh@inai.de> From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 8 Sep 2019 16:52:56 +0200 Date: Sun, 8 Sep 2019 16:52:56 +0200
Subject: [PATCH] build: cure compiler warnings 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 inode.c:792:37: note: format string is defined here
792 | erofs_info("add file %s/%s (nid %lu, type %d)", 792 | erofs_info("add file %s/%s (nid %lu, type %d)",
--- ---
lib/compress.c | 2 +- lib/compress.c | 4 ++--
lib/inode.c | 2 +- lib/inode.c | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/compress.c b/lib/compress.c diff --git a/lib/compress.c b/lib/compress.c
index a977c87..8d97e82 100644 index a977c87..cadf598 100644
--- a/lib/compress.c --- a/lib/compress.c
+++ b/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)); ret = erofs_bh_balloon(bh, blknr_to_addr(compressed_blocks));
DBG_BUGON(ret); DBG_BUGON(ret);
- erofs_info("compressed %s (%lu bytes) into %u blocks", - 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", + 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 diff --git a/lib/inode.c b/lib/inode.c
index 141a300..a514303 100644 index 141a300..db9ad99 100644
--- a/lib/inode.c --- a/lib/inode.c
+++ b/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]; d->type = erofs_type_by_mode[d->inode->i_mode >> S_SHIFT];
erofs_d_invalidate(d); erofs_d_invalidate(d);
- erofs_info("add file %s/%s (nid %lu, type %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)", + 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_dir_file(dir);
erofs_write_tail_end(dir);
-- --
2.23.0 2.23.0