commit bf42c724dd0dd8a76d1e8ce99eb1af72cc6807cd
author Elliott Hughes <enh@google.com> Mon May 06 12:22:59 2019 -0700
committer Elliott Hughes <enh@google.com> Mon May 06 12:22:59 2019 -0700
tree 19c2b2b773f7419a6613a7f36ad830147bddefdf
parent 4d450edb0f17c313b747376f7b65dd02ee2a2d4c

libidmap2: track libziparchive API change.

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

cmds/idmap2/libidmap2/ZipFile.cpp

diff --git a/cmds/idmap2/libidmap2/ZipFile.cpp b/cmds/idmap2/libidmap2/ZipFile.cpp
index 812fd6e..4f5e3a4 100644
--- a/cmds/idmap2/libidmap2/ZipFile.cpp
+++ b/cmds/idmap2/libidmap2/ZipFile.cpp
@@ -45,7 +45,7 @@
 
 std::unique_ptr<const MemoryChunk> ZipFile::Uncompress(const std::string& entryPath) const {
   ::ZipEntry entry;
-  int32_t status = ::FindEntry(handle_, ::ZipString(entryPath.c_str()), &entry);
+  int32_t status = ::FindEntry(handle_, entryPath, &entry);
   if (status != 0) {
     return nullptr;
   }
@@ -59,7 +59,7 @@
 
 Result<uint32_t> ZipFile::Crc(const std::string& entryPath) const {
   ::ZipEntry entry;
-  int32_t status = ::FindEntry(handle_, ::ZipString(entryPath.c_str()), &entry);
+  int32_t status = ::FindEntry(handle_, entryPath, &entry);
   if (status != 0) {
     return Error("failed to find zip entry %s", entryPath.c_str());
   }