From 39ac1c013c9c127c0ff8ad73b9cc2fbcc7f06ecb Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 12 Jun 2019 12:20:37 -0700
Subject: Use the new ziparchive Next std::string_view overload.

Bug: http://b/129068177
Test: treehugger
Change-Id: Ieec83126e36b330da33092a172e365376cd04dfe
---
 install/install.cpp  | 2 +-
 install/verifier.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/install.cpp b/install/install.cpp
index 8d46641dc..445f3ab34 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -539,7 +539,7 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) {
 
   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]),
diff --git a/install/verifier.cpp b/install/verifier.cpp
index 02759cdc2..ab750442d 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -320,7 +320,7 @@ static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchi
 
   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);
-- 
cgit v1.2.3