PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7 am: a3211f0ecb

Browse Source 
am: e242d87430

Change-Id: I8ff8cb1640f86224395570d84f68c16b4c2c4618
This commit is contained in:
Elliott Hughes
2019-06-13 13:42:14 -07:00
committed by android-build-merger
parent 90ced9877c e242d87430
commit 18ff27119d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/install.cpp
+1 -1
View File
@@ -539,7 +539,7 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) {
std::vector<std::string> compatibility_info; std::vector<std::string> compatibility_info;
ZipEntry info_entry; ZipEntry info_entry;
std::string info_name; std::string_view info_name;
while (Next(cookie, &info_entry, &info_name) == 0) { while (Next(cookie, &info_entry, &info_name) == 0) {
std::string content(info_entry.uncompressed_length, '\0'); std::string content(info_entry.uncompressed_length, '\0');
int32_t ret = ExtractToMemory(zip_handle, &info_entry, reinterpret_cast<uint8_t*>(&content[0]), int32_t ret = ExtractToMemory(zip_handle, &info_entry, reinterpret_cast<uint8_t*>(&content[0]),
install/verifier.cpp
+1 -1
View File
@@ -320,7 +320,7 @@ static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchi
std::vector<Certificate> result; std::vector<Certificate> result;
std::string name; std::string_view name;
ZipEntry entry; ZipEntry entry;
while ((iter_status = Next(cookie, &entry, &name)) == 0) { while ((iter_status = Next(cookie, &entry, &name)) == 0) {
std::vector<uint8_t> pem_content(entry.uncompressed_length); std::vector<uint8_t> pem_content(entry.uncompressed_length);