summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-04-20 20:15:26 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-04-20 20:15:26 +0200
commit0d6de12e68246581978ba0eff8963924a57a63c1 (patch)
tree32edc2048c063f83a95467274f8b2d1cc1d9dd27 /updater
parentMerge "applypatch: Dump patch info on mismatching patching result." am: d2c32b281b (diff)
parentMerge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." (diff)
downloadandroid_bootable_recovery-0d6de12e68246581978ba0eff8963924a57a63c1.tar
android_bootable_recovery-0d6de12e68246581978ba0eff8963924a57a63c1.tar.gz
android_bootable_recovery-0d6de12e68246581978ba0eff8963924a57a63c1.tar.bz2
android_bootable_recovery-0d6de12e68246581978ba0eff8963924a57a63c1.tar.lz
android_bootable_recovery-0d6de12e68246581978ba0eff8963924a57a63c1.tar.xz
android_bootable_recovery-0d6de12e68246581978ba0eff8963924a57a63c1.tar.zst
android_bootable_recovery-0d6de12e68246581978ba0eff8963924a57a63c1.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/blockimg.cpp5
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;