summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-04-21 11:34:44 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-04-21 11:34:44 +0200
commitc0403437379f4fb5ef9131c8ed4b46e67d595c5e (patch)
tree32edc2048c063f83a95467274f8b2d1cc1d9dd27 /updater
parentSnap for 4733905 from 0d4ef610f469ff42f42dba9fd535aaa8d8fd276b to qt-release (diff)
parentMerge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c am: 4cf3bc1875 (diff)
downloadandroid_bootable_recovery-c0403437379f4fb5ef9131c8ed4b46e67d595c5e.tar
android_bootable_recovery-c0403437379f4fb5ef9131c8ed4b46e67d595c5e.tar.gz
android_bootable_recovery-c0403437379f4fb5ef9131c8ed4b46e67d595c5e.tar.bz2
android_bootable_recovery-c0403437379f4fb5ef9131c8ed4b46e67d595c5e.tar.lz
android_bootable_recovery-c0403437379f4fb5ef9131c8ed4b46e67d595c5e.tar.xz
android_bootable_recovery-c0403437379f4fb5ef9131c8ed4b46e67d595c5e.tar.zst
android_bootable_recovery-c0403437379f4fb5ef9131c8ed4b46e67d595c5e.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;