summaryrefslogtreecommitdiffstats
path: root/updater/blockimg.cpp
diff options
context:
space:
mode:
authorKelvin Zhang <zhangkelvin@google.com>2020-09-17 02:50:21 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-17 02:50:21 +0200
commita973d68fcb0a1538200d562d2ce245237ea0ccda (patch)
tree8a910b26d07884180bcef5f5f48781ae642cf99e /updater/blockimg.cpp
parentMerge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE (diff)
parentMerge "Switch to zip64 in recovery" (diff)
downloadandroid_bootable_recovery-a973d68fcb0a1538200d562d2ce245237ea0ccda.tar
android_bootable_recovery-a973d68fcb0a1538200d562d2ce245237ea0ccda.tar.gz
android_bootable_recovery-a973d68fcb0a1538200d562d2ce245237ea0ccda.tar.bz2
android_bootable_recovery-a973d68fcb0a1538200d562d2ce245237ea0ccda.tar.lz
android_bootable_recovery-a973d68fcb0a1538200d562d2ce245237ea0ccda.tar.xz
android_bootable_recovery-a973d68fcb0a1538200d562d2ce245237ea0ccda.tar.zst
android_bootable_recovery-a973d68fcb0a1538200d562d2ce245237ea0ccda.zip
Diffstat (limited to 'updater/blockimg.cpp')
-rw-r--r--updater/blockimg.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 2d41f610b..b29aa8ce3 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -348,7 +348,7 @@ class RangeSinkWriter {
*/
struct NewThreadInfo {
ZipArchiveHandle za;
- ZipEntry entry;
+ ZipEntry64 entry{};
bool brotli_compressed;
std::unique_ptr<RangeSinkWriter> writer;
@@ -1626,7 +1626,7 @@ static bool Sha1DevicePath(const std::string& path, uint8_t digest[SHA_DIGEST_LE
static Value* PerformBlockImageUpdate(const char* name, State* state,
const std::vector<std::unique_ptr<Expr>>& argv,
const CommandMap& command_map, bool dryrun) {
- CommandParameters params = {};
+ CommandParameters params{};
stash_map.clear();
params.canwrite = !dryrun;
@@ -1687,7 +1687,7 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
}
std::string_view path_data(patch_data_fn->data);
- ZipEntry patch_entry;
+ ZipEntry64 patch_entry;
if (FindEntry(za, path_data, &patch_entry) != 0) {
LOG(ERROR) << name << "(): no file \"" << patch_data_fn->data << "\" in package";
return StringValue("");
@@ -1695,7 +1695,7 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
params.patch_start = updater->GetMappedPackageAddress() + patch_entry.offset;
std::string_view new_data(new_data_fn->data);
- ZipEntry new_entry;
+ ZipEntry64 new_entry;
if (FindEntry(za, new_data, &new_entry) != 0) {
LOG(ERROR) << name << "(): no file \"" << new_data_fn->data << "\" in package";
return StringValue("");