From a86dddbfa593ae1227806af9692fbb6223d4e435 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 3 May 2019 22:52:37 -0700 Subject: Track libziparchive API change. Bug: http://b/129068177 Test: treehugger Change-Id: Ie5b2b0cff087f2e9e65a4e77c187e3173357f3ad --- updater/install.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'updater/install.cpp') diff --git a/updater/install.cpp b/updater/install.cpp index 8eba64f5d..c30f63960 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -130,9 +130,8 @@ Value* PackageExtractFileFn(const char* name, State* state, const std::string& dest_path = args[1]; ZipArchiveHandle za = static_cast(state->cookie)->package_zip; - ZipString zip_string_path(zip_path.c_str()); ZipEntry entry; - if (FindEntry(za, zip_string_path, &entry) != 0) { + if (FindEntry(za, zip_path, &entry) != 0) { LOG(ERROR) << name << ": no " << zip_path << " in package"; return StringValue(""); } @@ -174,9 +173,8 @@ Value* PackageExtractFileFn(const char* name, State* state, const std::string& zip_path = args[0]; ZipArchiveHandle za = static_cast(state->cookie)->package_zip; - ZipString zip_string_path(zip_path.c_str()); ZipEntry entry; - if (FindEntry(za, zip_string_path, &entry) != 0) { + if (FindEntry(za, zip_path, &entry) != 0) { return ErrorAbort(state, kPackageExtractFileFailure, "%s(): no %s in package", name, zip_path.c_str()); } -- cgit v1.2.3