diff options
author | Ying Wang <wangying@google.com> | 2014-04-23 18:28:14 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-04-23 18:28:14 -0700 |
commit | 9d4c76f15249432c7bfdef1dca29597bcd90ac97 (patch) | |
tree | cbf4b84df9a549b2ed3cc8ec0c3a8b21985ac5a9 /libdiskconfig | |
parent | 8f94e6204d994aa67e7483c9434834345fe338ce (diff) | |
download | system_core-9d4c76f15249432c7bfdef1dca29597bcd90ac97.zip system_core-9d4c76f15249432c7bfdef1dca29597bcd90ac97.tar.gz system_core-9d4c76f15249432c7bfdef1dca29597bcd90ac97.tar.bz2 |
Fix 64-bit host build.
Bug: 13751317
Change-Id: I8ba4fc9918fba0975eb61ec37a8a16b02acfa864
Diffstat (limited to 'libdiskconfig')
-rw-r--r-- | libdiskconfig/diskutils.c | 6 | ||||
-rw-r--r-- | libdiskconfig/write_lst.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libdiskconfig/diskutils.c b/libdiskconfig/diskutils.c index 7659632..5d0ee62 100644 --- a/libdiskconfig/diskutils.c +++ b/libdiskconfig/diskutils.c @@ -41,7 +41,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) int done = 0; uint64_t total = 0; - ALOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, offset); + ALOGI("Writing RAW image '%s' to '%s' (offset=%llu)", src, dst, (unsigned long long)offset); if ((src_fd = open(src, O_RDONLY)) < 0) { ALOGE("Could not open %s for reading (errno=%d).", src, errno); goto fail; @@ -54,7 +54,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) } if (lseek64(dst_fd, offset, SEEK_SET) != offset) { - ALOGE("Could not seek to offset %lld in %s.", offset, dst); + ALOGE("Could not seek to offset %lld in %s.", (long long)offset, dst); goto fail; } } @@ -102,7 +102,7 @@ write_raw_image(const char *dst, const char *src, loff_t offset, int test) if (dst_fd >= 0) fsync(dst_fd); - ALOGI("Wrote %" PRIu64 " bytes to %s @ %lld", total, dst, offset); + ALOGI("Wrote %" PRIu64 " bytes to %s @ %lld", total, dst, (long long)offset); close(src_fd); if (dst_fd >= 0) diff --git a/libdiskconfig/write_lst.c b/libdiskconfig/write_lst.c index 826ef7a..90b1c82 100644 --- a/libdiskconfig/write_lst.c +++ b/libdiskconfig/write_lst.c @@ -71,18 +71,18 @@ wlist_commit(int fd, struct write_list *lst, int test) { for(; lst; lst = lst->next) { if (lseek64(fd, lst->offset, SEEK_SET) != (loff_t)lst->offset) { - ALOGE("Cannot seek to the specified position (%lld).", lst->offset); + ALOGE("Cannot seek to the specified position (%lld).", (long long)lst->offset); goto fail; } if (!test) { if (write(fd, lst->data, lst->len) != (int)lst->len) { ALOGE("Failed writing %u bytes at position %lld.", lst->len, - lst->offset); + (long long)lst->offset); goto fail; } } else - ALOGI("Would write %d bytes @ offset %lld.", lst->len, lst->offset); + ALOGI("Would write %d bytes @ offset %lld.", lst->len, (long long)lst->offset); } return 0; |