p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tianjie 2020-04-01 20:32:36 -07:00 committed by Tianjie Xu
parent a3541df291
commit 2751d2b8f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/zipalign/ZipFile.cpp
View File

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