diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-16 14:42:35 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-01-16 14:42:35 -0800 |
| commit | b70375abc2c4da6f868da4eef3d3f059acdf9774 (patch) | |
| tree | 52e04bc7cf0e003783006d488c7c6d276d500f45 /libsparse | |
| parent | 24239a99ffde4a264be3121bff8b1ee70b78f63c (diff) | |
| parent | ec9e5891ac97c50cfb8d3d1c9c2d478637eff62b (diff) | |
| download | system_core-b70375abc2c4da6f868da4eef3d3f059acdf9774.zip system_core-b70375abc2c4da6f868da4eef3d3f059acdf9774.tar.gz system_core-b70375abc2c4da6f868da4eef3d3f059acdf9774.tar.bz2 | |
resolved conflicts for merge of ec9e5891 to master
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
Diffstat (limited to 'libsparse')
| -rw-r--r-- | libsparse/output_file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libsparse/output_file.c b/libsparse/output_file.c index a28b0a5..e63c4a9 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c @@ -18,6 +18,7 @@ #define _LARGEFILE64_SOURCE 1 #include <fcntl.h> +#include <inttypes.h> #include <limits.h> #include <stdbool.h> #include <stddef.h> @@ -342,7 +343,7 @@ static int write_sparse_skip_chunk(struct output_file *out, int64_t skip_len) int ret, chunk; if (skip_len % out->block_size) { - error("don't care size %llu is not a multiple of the block size %u", + error("don't care size %"PRIi64" is not a multiple of the block size %u", skip_len, out->block_size); return -1; } |