diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-16 10:53:11 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-01-16 12:54:18 -0800 |
| commit | ccecf1425412beb2bc3bb38d470293fdc244d6f1 (patch) | |
| tree | 9fd922197bc88bed453efa0738f3dfb5d6db4c3c /fastbootd/commands | |
| parent | e847f429f43ae56aaa406697ca603c8469e2100b (diff) | |
| download | system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.zip system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.gz system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.bz2 | |
system/core 64-bit cleanup.
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.
Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
Diffstat (limited to 'fastbootd/commands')
| -rw-r--r-- | fastbootd/commands/flash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fastbootd/commands/flash.c b/fastbootd/commands/flash.c index 0954217..1eb4d1b 100644 --- a/fastbootd/commands/flash.c +++ b/fastbootd/commands/flash.c @@ -31,6 +31,7 @@ #include <sys/stat.h> #include <fcntl.h> +#include <inttypes.h> #include <sys/mman.h> #include "flash.h" @@ -82,7 +83,7 @@ int flash_erase(int fd) { int64_t size; size = get_block_device_size(fd); - D(DEBUG, "erase %llu data from %d\n", size, fd); + D(DEBUG, "erase %"PRId64" data from %d\n", size, fd); return wipe_block_device(fd, size); } @@ -97,7 +98,7 @@ int flash_write(int partition_fd, int data_fd, ssize_t size, ssize_t skip) int current_size = MIN(size - written, BUFFER_SIZE); if (gpt_mmap(&input, written + skip, current_size, data_fd)) { - D(ERR, "Error in writing data, unable to map data file %d at %d size %d", size, skip, current_size); + D(ERR, "Error in writing data, unable to map data file %zd at %zd size %d", size, skip, current_size); return -1; } if (gpt_mmap(&output, written, current_size, partition_fd)) { |