summaryrefslogtreecommitdiffstats
path: root/applypatch/bspatch.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-02-01 19:20:10 +0100
committerTao Bao <tbao@google.com>2017-03-28 19:14:53 +0200
commitc0e1c46a707370952ea1ddeb71b176d04fe71bb9 (patch)
treeee0958c7ee3dfbcb545fa285715d0ac81896661e /applypatch/bspatch.cpp
parentapplypatch: Change the ssize_t length parameters to size_t. (diff)
downloadandroid_bootable_recovery-c0e1c46a707370952ea1ddeb71b176d04fe71bb9.tar
android_bootable_recovery-c0e1c46a707370952ea1ddeb71b176d04fe71bb9.tar.gz
android_bootable_recovery-c0e1c46a707370952ea1ddeb71b176d04fe71bb9.tar.bz2
android_bootable_recovery-c0e1c46a707370952ea1ddeb71b176d04fe71bb9.tar.lz
android_bootable_recovery-c0e1c46a707370952ea1ddeb71b176d04fe71bb9.tar.xz
android_bootable_recovery-c0e1c46a707370952ea1ddeb71b176d04fe71bb9.tar.zst
android_bootable_recovery-c0e1c46a707370952ea1ddeb71b176d04fe71bb9.zip
Diffstat (limited to '')
-rw-r--r--applypatch/bspatch.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp
index 8ef7a068d..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"
@@ -61,9 +61,9 @@ void ShowBSDiffLicense() {
}
int ApplyBSDiffPatch(const unsigned char* old_data, size_t old_size, const Value* patch,
- size_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);
+ 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;
};