From 2751d2b8f3a55b3cdd853510b4d5aa308f8c53c8 Mon Sep 17 00:00:00 2001 From: Tianjie Date: Wed, 1 Apr 2020 20:32:36 -0700 Subject: Change the parameter type of offset in read As we support zip64 in libziparchive, we change the parameter of the ReadAtOffset() in zip reader from uin32_t to off64_t. So the derived class needs to be updated as well. Bug: 150900468 Test: build Change-Id: Icbfd2dd54b01ff62da988ba8598c1057f9bb6368 --- tools/zipalign/ZipFile.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/zipalign/ZipFile.cpp') diff --git a/tools/zipalign/ZipFile.cpp b/tools/zipalign/ZipFile.cpp index 63fb962767..88505b7508 100644 --- a/tools/zipalign/ZipFile.cpp +++ b/tools/zipalign/ZipFile.cpp @@ -1221,7 +1221,7 @@ class FileReader : public zip_archive::Reader { FileReader(FILE* fp) : Reader(), fp_(fp), current_offset_(0) { } - bool ReadAtOffset(uint8_t* buf, size_t len, uint32_t offset) const { + bool ReadAtOffset(uint8_t* buf, size_t len, off64_t offset) const { // Data is usually requested sequentially, so this helps avoid pointless // fseeks every time we perform a read. There's an impedence mismatch // here because the original API was designed around pread and pwrite. @@ -1244,7 +1244,7 @@ class FileReader : public zip_archive::Reader { private: FILE* fp_; - mutable uint32_t current_offset_; + mutable off64_t current_offset_; }; // free the memory when you're done -- cgit v1.2.3-59-g8ed1b