summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2014-01-16 16:42:35 -0600
committerElliott Hughes2014-01-16 16:42:35 -0600
commitb70375abc2c4da6f868da4eef3d3f059acdf9774 (patch)
tree52e04bc7cf0e003783006d488c7c6d276d500f45 /libsparse
parent24239a99ffde4a264be3121bff8b1ee70b78f63c (diff)
parentec9e5891ac97c50cfb8d3d1c9c2d478637eff62b (diff)
downloadplatform-system-core-b70375abc2c4da6f868da4eef3d3f059acdf9774.tar.gz
platform-system-core-b70375abc2c4da6f868da4eef3d3f059acdf9774.tar.xz
platform-system-core-b70375abc2c4da6f868da4eef3d3f059acdf9774.zip
resolved conflicts for merge of ec9e5891 to master
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
Diffstat (limited to 'libsparse')
-rw-r--r--libsparse/output_file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libsparse/output_file.c b/libsparse/output_file.c
index a28b0a5ad..e63c4a929 100644
--- a/libsparse/output_file.c
+++ b/libsparse/output_file.c
@@ -18,6 +18,7 @@
18#define _LARGEFILE64_SOURCE 1 18#define _LARGEFILE64_SOURCE 1
19 19
20#include <fcntl.h> 20#include <fcntl.h>
21#include <inttypes.h>
21#include <limits.h> 22#include <limits.h>
22#include <stdbool.h> 23#include <stdbool.h>
23#include <stddef.h> 24#include <stddef.h>
@@ -342,7 +343,7 @@ static int write_sparse_skip_chunk(struct output_file *out, int64_t skip_len)
342 int ret, chunk; 343 int ret, chunk;
343 344
344 if (skip_len % out->block_size) { 345 if (skip_len % out->block_size) {
345 error("don't care size %llu is not a multiple of the block size %u", 346 error("don't care size %"PRIi64" is not a multiple of the block size %u",
346 skip_len, out->block_size); 347 skip_len, out->block_size);
347 return -1; 348 return -1;
348 } 349 }