summaryrefslogtreecommitdiffstats
path: root/applypatch/imgdiff.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-23 19:55:27 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-05-23 19:55:27 +0200
commit7b67d2851806a6c4d66953564b5d2c052bdc8f9c (patch)
treeb191a6b41229ce9867842fc60e5bd9dae1e96f54 /applypatch/imgdiff.cpp
parentMerge "Revert "recovery: report compliant reboot reason"" (diff)
parentMove off the Next ZipString overload. (diff)
downloadandroid_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.gz
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.bz2
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.lz
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.xz
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.zst
android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.zip
Diffstat (limited to 'applypatch/imgdiff.cpp')
-rw-r--r--applypatch/imgdiff.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index cb34d4699..6ad4a6105 100644
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp
@@ -683,12 +683,11 @@ 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;
- ZipString name;
+ std::string name;
ZipEntry entry;
while ((ret = Next(cookie, &entry, &name)) == 0) {
if (entry.method == kCompressDeflated || limit_ > 0) {
- std::string entry_name(name.name, name.name + name.name_length);
- temp_entries.emplace_back(entry_name, entry);
+ temp_entries.emplace_back(name, entry);
}
}