diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-03-28 21:01:31 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-28 21:01:32 +0200 |
commit | 34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958 (patch) | |
tree | ee0958c7ee3dfbcb545fa285715d0ac81896661e /applypatch/bspatch.cpp | |
parent | Merge "updater: Clean up LoadSrcTgtVersion2()." (diff) | |
parent | applypatch: Let Apply{BSDiff,Image}Patch accept std::function. (diff) | |
download | android_bootable_recovery-34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958.tar android_bootable_recovery-34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958.tar.gz android_bootable_recovery-34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958.tar.bz2 android_bootable_recovery-34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958.tar.lz android_bootable_recovery-34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958.tar.xz android_bootable_recovery-34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958.tar.zst android_bootable_recovery-34df98ee6dfaec9b95c2f5d3e6f64c0daacc1958.zip |
Diffstat (limited to 'applypatch/bspatch.cpp')
-rw-r--r-- | applypatch/bspatch.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp index 9920c2be1..f75a2c680 100644 --- a/applypatch/bspatch.cpp +++ b/applypatch/bspatch.cpp @@ -24,9 +24,9 @@ #include <sys/types.h> #include <bspatch.h> +#include <openssl/sha.h> #include "applypatch/applypatch.h" -#include "openssl/sha.h" void ShowBSDiffLicense() { puts("The bsdiff library used herein is:\n" @@ -60,10 +60,10 @@ void ShowBSDiffLicense() { ); } -int ApplyBSDiffPatch(const unsigned char* old_data, ssize_t old_size, const Value* patch, - ssize_t patch_offset, SinkFn sink, void* token, SHA_CTX* ctx) { - auto sha_sink = [&](const uint8_t* data, size_t len) { - len = sink(data, len, token); +int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value* patch, + size_t patch_offset, SinkFn sink, SHA_CTX* ctx) { + auto sha_sink = [&sink, &ctx](const uint8_t* data, size_t len) { + len = sink(data, len); if (ctx) SHA1_Update(ctx, data, len); return len; }; @@ -72,8 +72,8 @@ int ApplyBSDiffPatch(const unsigned char* old_data, ssize_t old_size, const Valu patch->data.size(), sha_sink); } -int ApplyBSDiffPatchMem(const unsigned char* old_data, ssize_t old_size, const Value* patch, - ssize_t patch_offset, std::vector<unsigned char>* new_data) { +int ApplyBSDiffPatchMem(const unsigned char* old_data, size_t old_size, const Value* patch, + size_t patch_offset, std::vector<unsigned char>* new_data) { auto vector_sink = [new_data](const uint8_t* data, size_t len) { new_data->insert(new_data->end(), data, data + len); return len; |