openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix 64-bit host build."

This commit is contained in:
Ying Wang 2014-04-24 19:49:33 +00:00 committed by Android (Google) Code Review
parent f4362ccdd5 9d4c76f152
commit c0fb957404
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libdiskconfig/diskutils.c
View File

@ -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)

6
libdiskconfig/write_lst.c
View File

@ -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;