diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-20 20:03:42 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-20 20:03:42 +0200 |
| commit | bcb015239c5affc81414d45726aff7efac020a5f (patch) | |
| tree | ce9cf683304b2d70ae800bb6811842b375904beb /updater/blockimg.cpp | |
| parent | Merge "applypatch: Dump patch info on mismatching patching result." (diff) | |
| parent | applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch. (diff) | |
| download | android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.gz android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.bz2 android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.lz android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.xz android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.tar.zst android_bootable_recovery-bcb015239c5affc81414d45726aff7efac020a5f.zip | |
Diffstat (limited to 'updater/blockimg.cpp')
| -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; |