diff options
| author | Tao Bao <tbao@google.com> | 2017-11-11 02:18:04 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-11 02:18:04 +0100 |
| commit | e2296b7a25075f549e77553d04778ff295d3b80f (patch) | |
| tree | 52c1336bbc9b9859377e53b4debc8fb20ff18dd9 /updater | |
| parent | Merge "Include bspatch.h from bsdiff/" (diff) | |
| parent | Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." (diff) | |
| download | android_bootable_recovery-e2296b7a25075f549e77553d04778ff295d3b80f.tar android_bootable_recovery-e2296b7a25075f549e77553d04778ff295d3b80f.tar.gz android_bootable_recovery-e2296b7a25075f549e77553d04778ff295d3b80f.tar.bz2 android_bootable_recovery-e2296b7a25075f549e77553d04778ff295d3b80f.tar.lz android_bootable_recovery-e2296b7a25075f549e77553d04778ff295d3b80f.tar.xz android_bootable_recovery-e2296b7a25075f549e77553d04778ff295d3b80f.tar.zst android_bootable_recovery-e2296b7a25075f549e77553d04778ff295d3b80f.zip | |
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/blockimg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 1c931afef..08f9930ea 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -1318,7 +1318,7 @@ static int PerformCommandDiff(CommandParameters& params) { RangeSinkWriter writer(params.fd, tgt); if (params.cmdname[0] == 'i') { // imgdiff - if (ApplyImagePatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value, + if (ApplyImagePatch(params.buffer.data(), blocks * BLOCKSIZE, patch_value, std::bind(&RangeSinkWriter::Write, &writer, std::placeholders::_1, std::placeholders::_2), nullptr, nullptr) != 0) { @@ -1327,7 +1327,7 @@ static int PerformCommandDiff(CommandParameters& params) { return -1; } } else { - if (ApplyBSDiffPatch(params.buffer.data(), blocks * BLOCKSIZE, &patch_value, 0, + if (ApplyBSDiffPatch(params.buffer.data(), blocks * BLOCKSIZE, patch_value, 0, std::bind(&RangeSinkWriter::Write, &writer, std::placeholders::_1, std::placeholders::_2), nullptr) != 0) { |