summaryrefslogtreecommitdiffstats
path: root/applypatch/include
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-10-18 02:21:59 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-10-18 02:21:59 +0200
commit13d8ee8c72ae3705819e1e0afae765e2d66a89bf (patch)
treec9f593eb6a4f2a2aaef3d400366525048e40a2b5 /applypatch/include
parentMerge "init: move healthd to late-init" am: a01ffc73ef (diff)
parentMerge "Change StringValue to use std::string" (diff)
downloadandroid_bootable_recovery-13d8ee8c72ae3705819e1e0afae765e2d66a89bf.tar
android_bootable_recovery-13d8ee8c72ae3705819e1e0afae765e2d66a89bf.tar.gz
android_bootable_recovery-13d8ee8c72ae3705819e1e0afae765e2d66a89bf.tar.bz2
android_bootable_recovery-13d8ee8c72ae3705819e1e0afae765e2d66a89bf.tar.lz
android_bootable_recovery-13d8ee8c72ae3705819e1e0afae765e2d66a89bf.tar.xz
android_bootable_recovery-13d8ee8c72ae3705819e1e0afae765e2d66a89bf.tar.zst
android_bootable_recovery-13d8ee8c72ae3705819e1e0afae765e2d66a89bf.zip
Diffstat (limited to 'applypatch/include')
-rw-r--r--applypatch/include/applypatch/applypatch.h10
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();