diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2020-09-16 20:06:12 +0200 |
---|---|---|
committer | Kelvin Zhang <zhangkelvin@google.com> | 2020-09-16 20:21:37 +0200 |
commit | 4f81130039f6a312eba2027b3594a2be282f6b3a (patch) | |
tree | 8a910b26d07884180bcef5f5f48781ae642cf99e /applypatch/imgdiff.cpp | |
parent | Merge "Merge Android R" (diff) | |
download | android_bootable_recovery-4f81130039f6a312eba2027b3594a2be282f6b3a.tar android_bootable_recovery-4f81130039f6a312eba2027b3594a2be282f6b3a.tar.gz android_bootable_recovery-4f81130039f6a312eba2027b3594a2be282f6b3a.tar.bz2 android_bootable_recovery-4f81130039f6a312eba2027b3594a2be282f6b3a.tar.lz android_bootable_recovery-4f81130039f6a312eba2027b3594a2be282f6b3a.tar.xz android_bootable_recovery-4f81130039f6a312eba2027b3594a2be282f6b3a.tar.zst android_bootable_recovery-4f81130039f6a312eba2027b3594a2be282f6b3a.zip |
Diffstat (limited to 'applypatch/imgdiff.cpp')
-rw-r--r-- | applypatch/imgdiff.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp index 85860281a..d0cb687cb 100644 --- a/applypatch/imgdiff.cpp +++ b/applypatch/imgdiff.cpp @@ -682,9 +682,9 @@ bool ZipModeImage::InitializeChunks(const std::string& filename, ZipArchiveHandl } // Create a list of deflated zip entries, sorted by offset. - std::vector<std::pair<std::string, ZipEntry>> temp_entries; + std::vector<std::pair<std::string, ZipEntry64>> temp_entries; std::string name; - ZipEntry entry; + ZipEntry64 entry; while ((ret = Next(cookie, &entry, &name)) == 0) { if (entry.method == kCompressDeflated || limit_ > 0) { temp_entries.emplace_back(name, entry); @@ -757,7 +757,7 @@ bool ZipModeImage::InitializeChunks(const std::string& filename, ZipArchiveHandl } bool ZipModeImage::AddZipEntryToChunks(ZipArchiveHandle handle, const std::string& entry_name, - ZipEntry* entry) { + ZipEntry64* entry) { size_t compressed_len = entry->compressed_length; if (compressed_len == 0) return true; |