Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d6523a authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

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

parents 344c8eb4 c8e79340

applypatch/applypatch.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,