commit 053ea111a716b91fea9fbe2f7e3a7996baf83821
author Elliott Hughes <enh@google.com> Thu Jun 13 19:59:18 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 13 19:59:18 2019 +0000
tree ae3bdceb42799992b9a72f23b01e754b2527c946
parent eb33356544c3b87408d79e2125efdfe20787855a
parent 39ac1c013c9c127c0ff8ad73b9cc2fbcc7f06ecb

Merge "Use the new ziparchive Next std::string_view overload."

install/install.cpp

diff --git a/install/install.cpp b/install/install.cpp
index 8d46641..445f3ab 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -539,7 +539,7 @@
 
   std::vector<std::string> compatibility_info;
   ZipEntry info_entry;
-  std::string info_name;
+  std::string_view info_name;
   while (Next(cookie, &info_entry, &info_name) == 0) {
     std::string content(info_entry.uncompressed_length, '\0');
     int32_t ret = ExtractToMemory(zip_handle, &info_entry, reinterpret_cast<uint8_t*>(&content[0]),

install/verifier.cpp

diff --git a/install/verifier.cpp b/install/verifier.cpp
index 02759cd..ab75044 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -320,7 +320,7 @@
 
   std::vector<Certificate> result;
 
-  std::string name;
+  std::string_view name;
   ZipEntry entry;
   while ((iter_status = Next(cookie, &entry, &name)) == 0) {
     std::vector<uint8_t> pem_content(entry.uncompressed_length);