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

Merge "Track libziparchive API change."

Browse Source 
am: 6da27adb0b

Change-Id: Ib261d224fe4b57ead972987466dc30411505aa30
This commit is contained in:
Elliott Hughes
2019-05-09 14:46:26 -07:00
committed by android-build-merger
parent e945763a5d 6da27adb0b
commit 46fa74623a
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/imgdiff.cpp
+1 -1
View File
@@ -675,7 +675,7 @@ bool ZipModeImage::Initialize(const std::string& filename) {
// Iterate the zip entries and compose the image chunks accordingly. // Iterate the zip entries and compose the image chunks accordingly.
bool ZipModeImage::InitializeChunks(const std::string& filename, ZipArchiveHandle handle) { bool ZipModeImage::InitializeChunks(const std::string& filename, ZipArchiveHandle handle) {
void* cookie; void* cookie;
int ret = StartIteration(handle, &cookie, nullptr, nullptr); int ret = StartIteration(handle, &cookie);
if (ret != 0) { if (ret != 0) {
LOG(ERROR) << "Failed to iterate over entries in " << filename << ": " << ErrorCodeString(ret); LOG(ERROR) << "Failed to iterate over entries in " << filename << ": " << ErrorCodeString(ret);
return false; return false;
install/install.cpp
+1 -1
View File
@@ -529,7 +529,7 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) {
// Iterate all the entries inside COMPATIBILITY_ZIP_ENTRY and read the contents. // Iterate all the entries inside COMPATIBILITY_ZIP_ENTRY and read the contents.
void* cookie; void* cookie;
ret = StartIteration(zip_handle, &cookie, nullptr, nullptr); ret = StartIteration(zip_handle, &cookie);
if (ret != 0) { if (ret != 0) {
LOG(ERROR) << "Failed to start iterating zip entries: " << ErrorCodeString(ret); LOG(ERROR) << "Failed to start iterating zip entries: " << ErrorCodeString(ret);
CloseArchive(zip_handle); CloseArchive(zip_handle);
install/verifier.cpp
+1 -2
View File
@@ -311,8 +311,7 @@ int verify_file(VerifierInterface* package, const std::vector<Certificate>& keys
static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchiveHandle& handle) { static std::vector<Certificate> IterateZipEntriesAndSearchForKeys(const ZipArchiveHandle& handle) {
void* cookie; void* cookie;
ZipString suffix("x509.pem"); int32_t iter_status = StartIteration(handle, &cookie, "", "x509.pem");
int32_t iter_status = StartIteration(handle, &cookie, nullptr, &suffix);
if (iter_status != 0) { if (iter_status != 0) {
LOG(ERROR) << "Failed to iterate over entries in the certificate zipfile: " LOG(ERROR) << "Failed to iterate over entries in the certificate zipfile: "
<< ErrorCodeString(iter_status); << ErrorCodeString(iter_status);