diff options
author | Tianjie Xu <xunchang@google.com> | 2016-10-18 02:15:29 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 02:15:29 +0200 |
commit | 430b7ae4699eb3685dcc0f7c736a9aebd76829a8 (patch) | |
tree | e237b84e2e6f4cd6a562f88ab3e491eca8767e9f /applypatch/include | |
parent | Merge "init: move healthd to late-init" (diff) | |
parent | Merge "Change StringValue to use std::string" (diff) | |
download | android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.gz android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.bz2 android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.lz android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.xz android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.tar.zst android_bootable_recovery-430b7ae4699eb3685dcc0f7c736a9aebd76829a8.zip |
Diffstat (limited to 'applypatch/include')
-rw-r--r-- | applypatch/include/applypatch/applypatch.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/applypatch/include/applypatch/applypatch.h b/applypatch/include/applypatch/applypatch.h index 9ee39d293..80d681638 100644 --- a/applypatch/include/applypatch/applypatch.h +++ b/applypatch/include/applypatch/applypatch.h @@ -20,6 +20,7 @@ #include <stdint.h> #include <sys/stat.h> +#include <string> #include <vector> #include "openssl/sha.h" @@ -52,19 +53,16 @@ int applypatch(const char* source_filename, const char* target_filename, const char* target_sha1_str, size_t target_size, - int num_patches, - char** const patch_sha1_str, + const std::vector<std::string>& patch_sha1_str, Value** patch_data, Value* bonus_data); int applypatch_check(const char* filename, - int num_patches, - char** const patch_sha1_str); + const std::vector<std::string>& patch_sha1_str); int LoadFileContents(const char* filename, FileContents* file); int SaveFileContents(const char* filename, const FileContents* file); void FreeFileContents(FileContents* file); -int FindMatchingPatch(uint8_t* sha1, char* const * const patch_sha1_str, - int num_patches); +int FindMatchingPatch(uint8_t* sha1, const std::vector<std::string>& patch_sha1_str); // bsdiff.cpp void ShowBSDiffLicense(); |