From 88d8001e752573d8b87f7b0cbc784a18622abddd Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 22 May 2019 18:52:29 -0700
Subject: Move off the Next ZipString overload.

Bug: http://b/129068177
Test: treehugger
Change-Id: I3c8f70b0d8cc5dc6b3b4439dbe0b9a5bd85003c4
---
 applypatch/imgdiff.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'applypatch/imgdiff.cpp')

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);
     }
   }
 
-- 
cgit v1.2.3