diff options
| author | Elliott Hughes <enh@google.com> | 2019-05-07 01:45:16 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-07 01:45:16 +0200 |
| commit | 9423d2f6b7efcc94679ecdda5c5ca15039407d6b (patch) | |
| tree | 1284c020d0c3ed532f72ee1702b424339016871c /updater/install.cpp | |
| parent | Merge "Disable libbootloader_message for darwin" (diff) | |
| parent | Track libziparchive API change. (diff) | |
| download | android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.gz android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.bz2 android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.lz android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.xz android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.zst android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | updater/install.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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<UpdaterInfo*>(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<UpdaterInfo*>(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()); } |