diff options
| author | Elliott Hughes <enh@google.com> | 2019-05-23 19:55:27 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-23 19:55:27 +0200 |
| commit | 7b67d2851806a6c4d66953564b5d2c052bdc8f9c (patch) | |
| tree | b191a6b41229ce9867842fc60e5bd9dae1e96f54 /install/install.cpp | |
| parent | Merge "Revert "recovery: report compliant reboot reason"" (diff) | |
| parent | Move off the Next ZipString overload. (diff) | |
| download | android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.gz android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.bz2 android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.lz android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.xz android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.tar.zst android_bootable_recovery-7b67d2851806a6c4d66953564b5d2c052bdc8f9c.zip | |
Diffstat (limited to 'install/install.cpp')
| -rw-r--r-- | install/install.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install/install.cpp b/install/install.cpp index 1b51b4246..8d46641dc 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -539,13 +539,13 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) { std::vector<std::string> compatibility_info; ZipEntry info_entry; - ZipString info_name; + std::string 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]), info_entry.uncompressed_length); if (ret != 0) { - LOG(ERROR) << "Failed to read " << info_name.name << ": " << ErrorCodeString(ret); + LOG(ERROR) << "Failed to read " << info_name << ": " << ErrorCodeString(ret); CloseArchive(zip_handle); return false; } |