diff options
author | Tao Bao <tbao@google.com> | 2018-04-20 20:11:02 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-04-20 20:11:02 +0200 |
commit | 4cf3bc18756782bfe09f683b0a52431f4430ec33 (patch) | |
tree | ce9cf683304b2d70ae800bb6811842b375904beb /updater | |
parent | Merge "applypatch: Dump patch info on mismatching patching result." (diff) | |
parent | Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." (diff) | |
download | android_bootable_recovery-4cf3bc18756782bfe09f683b0a52431f4430ec33.tar android_bootable_recovery-4cf3bc18756782bfe09f683b0a52431f4430ec33.tar.gz android_bootable_recovery-4cf3bc18756782bfe09f683b0a52431f4430ec33.tar.bz2 android_bootable_recovery-4cf3bc18756782bfe09f683b0a52431f4430ec33.tar.lz android_bootable_recovery-4cf3bc18756782bfe09f683b0a52431f4430ec33.tar.xz android_bootable_recovery-4cf3bc18756782bfe09f683b0a52431f4430ec33.tar.zst android_bootable_recovery-4cf3bc18756782bfe09f683b0a52431f4430ec33.zip |
Diffstat (limited to 'updater')
-rw-r--r-- | updater/blockimg.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index e93196b27..e72ddd313 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1429,7 +1429,7 @@ static int PerformCommandDiff(CommandParameters& params) { if (ApplyImagePatch(params.buffer.data(), blocks * BLOCKSIZE, patch_value, std::bind(&RangeSinkWriter::Write, &writer, std::placeholders::_1, std::placeholders::_2), - nullptr, nullptr) != 0) { + nullptr) != 0) { LOG(ERROR) << "Failed to apply image patch."; failure_type = kPatchApplicationFailure; return -1; @@ -1437,8 +1437,7 @@ static int PerformCommandDiff(CommandParameters& params) { } else { if (ApplyBSDiffPatch(params.buffer.data(), blocks * BLOCKSIZE, patch_value, 0, std::bind(&RangeSinkWriter::Write, &writer, std::placeholders::_1, - std::placeholders::_2), - nullptr) != 0) { + std::placeholders::_2)) != 0) { LOG(ERROR) << "Failed to apply bsdiff patch."; failure_type = kPatchApplicationFailure; return -1; |