diff options
author | Elliott Hughes <enh@google.com> | 2019-05-22 18:52:29 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2019-05-22 18:52:29 -0700 |
commit | 88d8001e752573d8b87f7b0cbc784a18622abddd (patch) | |
tree | a7d815c4ea32e256958dee0b95026b7e18a6a755 /applypatch | |
parent | d31fb2e7fc7dd0afef5404d52700027c755c8ff2 (diff) |
Move off the Next ZipString overload.
Bug: http://b/129068177
Test: treehugger
Change-Id: I3c8f70b0d8cc5dc6b3b4439dbe0b9a5bd85003c4
Diffstat (limited to 'applypatch')
-rw-r--r-- | applypatch/imgdiff.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp index cb34d469..6ad4a610 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); } } |