summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-28 23:24:27 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-28 23:24:27 +0100
commit1b296587020572809c27d72c1bd7fd64a4cf8a8a (patch)
tree4e12ff6a9d0882076897f11302c6043b0d86b0a4
parentMerge "Add tests for imgdiff." am: 344c8eb453 (diff)
parentMerge "applypatch: Don't expose FindMatchingPatch()." (diff)
downloadandroid_bootable_recovery-1b296587020572809c27d72c1bd7fd64a4cf8a8a.tar
android_bootable_recovery-1b296587020572809c27d72c1bd7fd64a4cf8a8a.tar.gz
android_bootable_recovery-1b296587020572809c27d72c1bd7fd64a4cf8a8a.tar.bz2
android_bootable_recovery-1b296587020572809c27d72c1bd7fd64a4cf8a8a.tar.lz
android_bootable_recovery-1b296587020572809c27d72c1bd7fd64a4cf8a8a.tar.xz
android_bootable_recovery-1b296587020572809c27d72c1bd7fd64a4cf8a8a.tar.zst
android_bootable_recovery-1b296587020572809c27d72c1bd7fd64a4cf8a8a.zip
-rw-r--r--applypatch/applypatch.cpp2
-rw-r--r--applypatch/include/applypatch/applypatch.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 8682e128b..500663120 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -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 &&
diff --git a/applypatch/include/applypatch/applypatch.h b/applypatch/include/applypatch/applypatch.h
index ca3dafbc9..4489decb6 100644
--- a/applypatch/include/applypatch/applypatch.h
+++ b/applypatch/include/applypatch/applypatch.h
@@ -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,