commit 143a03fa034eb7b522a0f734689874907f5c99a0
author Elliott Hughes <enh@google.com> Tue May 07 14:59:09 2019 -0700
committer Elliott Hughes <enh@google.com> Wed May 08 17:28:22 2019 -0700
tree c030d550e966ca0adc7dcf06ca417407f4a6fd0b
parent 9423d2f6b7efcc94679ecdda5c5ca15039407d6b

Track libziparchive API change.

Bug: http://b/129068177
Test: treehugger
Change-Id: I618bbcf38914dd81e042e0cfd1976ff26274dc30

install/install.cpp

diff --git a/install/install.cpp b/install/install.cpp
index d62bffc..1b51b42 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -529,7 +529,7 @@
 
   // Iterate all the entries inside COMPATIBILITY_ZIP_ENTRY and read the contents.
   void* cookie;
-  ret = StartIteration(zip_handle, &cookie, nullptr, nullptr);
+  ret = StartIteration(zip_handle, &cookie);
   if (ret != 0) {
     LOG(ERROR) << "Failed to start iterating zip entries: " << ErrorCodeString(ret);
     CloseArchive(zip_handle);

install/verifier.cpp

diff --git a/install/verifier.cpp b/install/verifier.cpp
index 6ba1d77..3de58e4 100644
--- a/install/verifier.cpp
+++ b/install/verifier.cpp
@@ -311,8 +311,7 @@
 
 static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchiveHandle& handle) {
   void* cookie;
-  ZipString suffix("x509.pem");
-  int32_t iter_status = StartIteration(handle, &cookie, nullptr, &suffix);
+  int32_t iter_status = StartIteration(handle, &cookie, "", "x509.pem");
   if (iter_status != 0) {
     LOG(ERROR) << "Failed to iterate over entries in the certificate zipfile: "
                << ErrorCodeString(iter_status);