PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf

Browse Source 
am: 29e1b7b4b2

Change-Id: Ica4a7e02c1939065c404f9789941ee9206611643
This commit is contained in:
Tao Bao
2016-12-28 22:24:27 +00:00
committed by android-build-merger
parent 4e2471d6dd 29e1b7b4b2
commit 1b29658702
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/applypatch.cpp
+1 -1
View File
@@ -391,7 +391,7 @@ int ParseSha1(const char* str, uint8_t* digest) {
// Search an array of sha1 strings for one matching the given sha1.
// Return the index of the match on success, or -1 if no match is
// found.
int FindMatchingPatch(uint8_t* sha1, const std::vector<std::string>& patch_sha1_str) {
static int FindMatchingPatch(uint8_t* sha1, const std::vector<std::string>& patch_sha1_str) {
for (size_t i = 0; i < patch_sha1_str.size(); ++i) {
uint8_t patch_sha1[SHA_DIGEST_LENGTH];
if (ParseSha1(patch_sha1_str[i].c_str(), patch_sha1) == 0 &&
applypatch/include/applypatch/applypatch.h
+1 -2
View File
@@ -63,9 +63,8 @@ int applypatch_flash(const char* source_filename, const char* target_filename,
int LoadFileContents(const char* filename, FileContents* file);
int SaveFileContents(const char* filename, const FileContents* file);
int FindMatchingPatch(uint8_t* sha1, const std::vector<std::string>& patch_sha1_str);
// bsdiff.cpp
// bspatch.cpp
void ShowBSDiffLicense();
int ApplyBSDiffPatch(const unsigned char* old_data, ssize_t old_size,
const Value* patch, ssize_t patch_offset,