diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-05-08 19:16:40 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2014-05-08 19:16:40 -0700 |
commit | 96c5c99bda0d6fec3acb32bc1aea10ebe81be017 (patch) | |
tree | 2cf5e13248d0139c461d31aa56ad40fe9d780a7b /libziparchive | |
parent | f304730c2893d7b5d47cfe393fb2d6d3f4fced84 (diff) | |
download | system_core-96c5c99bda0d6fec3acb32bc1aea10ebe81be017.zip system_core-96c5c99bda0d6fec3acb32bc1aea10ebe81be017.tar.gz system_core-96c5c99bda0d6fec3acb32bc1aea10ebe81be017.tar.bz2 |
libziparchive: off64_t is not int64_t (part deux)
Change-Id: I38e78bdba338a0c40aec43d6c86f26f388cee6ab
Diffstat (limited to 'libziparchive')
-rw-r--r-- | libziparchive/zip_archive.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index 1063dbe..6781ebe 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc @@ -338,7 +338,7 @@ static int32_t MapCentralDirectory0(int fd, const char* debug_file_name, const off64_t search_start = file_length - read_amount; if (lseek64(fd, search_start, SEEK_SET) != search_start) { - ALOGW("Zip: seek %" PRId64 " failed: %s", search_start, strerror(errno)); + ALOGW("Zip: seek %" PRId64 " failed: %s", (int64_t)search_start, strerror(errno)); return kIoError; } ssize_t actual = TEMP_FAILURE_RETRY(read(fd, scan_buffer, read_amount)); @@ -381,7 +381,7 @@ static int32_t MapCentralDirectory0(int fd, const char* debug_file_name, if (dir_offset + dir_size > eocd_offset) { ALOGW("Zip: bad offsets (dir %" PRId64 ", size %" PRId64 ", eocd %" PRId64 ")", - dir_offset, dir_size, eocd_offset); + (int64_t)dir_offset, (int64_t)dir_size, (int64_t)eocd_offset); return kInvalidOffset; } if (num_entries == 0) { @@ -390,7 +390,7 @@ static int32_t MapCentralDirectory0(int fd, const char* debug_file_name, } ALOGV("+++ num_entries=%d dir_size=%" PRId64 " dir_offset=%" PRId64, - num_entries, dir_size, dir_offset); + num_entries, (int64_t)dir_size, (int64_t)dir_offset); /* * It all looks good. Create a mapping for the CD, and set the fields @@ -766,7 +766,7 @@ static int32_t FindEntry(const ZipArchive* archive, const int ent, if (data->method == kCompressStored && (off64_t)(data_offset + data->uncompressed_length) > cd_offset) { ALOGW("Zip: bad uncompressed length in zip (%" PRId64 " + %" PRIu32 " > %" PRId64 ")", - data_offset, data->uncompressed_length, cd_offset); + (int64_t)data_offset, data->uncompressed_length, (int64_t)cd_offset); return kInvalidOffset; } |