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

Commit b07b2939 authored by Doug Zongker's avatar Doug Zongker
Browse files

fix build 

Change-Id: I44a75f5451af053778be299b23274ecce9b2db76
parent 1c43c974

applypatch/applypatch.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,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, char** const patch_sha1_str,

int FindMatchingPatch(uint8_t* sha1, const char** patch_sha1_str,

                      int num_patches) {

    int i;

    uint8_t patch_sha1[SHA_DIGEST_SIZE];

applypatch/applypatch.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int LoadFileContents(const char* filename, FileContents* file, 
                     int retouch_flag);

int SaveFileContents(const char* filename, const FileContents* file);

void FreeFileContents(FileContents* file);

int FindMatchingPatch(uint8_t* sha1, char** const patch_sha1_str,

int FindMatchingPatch(uint8_t* sha1, const char** patch_sha1_str,

                      int num_patches);



// bsdiff.c

minelf/Retouch.c

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ bool retouch_one_library(const char *binary_name, 
                success = false;

                goto out;

            }

            if (SaveFileContents(CACHE_TEMP_SOURCE, file) < 0) {

            if (SaveFileContents(CACHE_TEMP_SOURCE, &file) < 0) {

                printf("Failed to back up source file.\n");

                success = false;

                goto out;
@@ -357,7 +357,7 @@ bool retouch_one_library(const char *binary_name, 
            printf("(now %ld bytes free for target)\n", (long)free_space);

        }



        result = SaveFileContents(binary_name_atomic, file);

        result = SaveFileContents(binary_name_atomic, &file);

        if (result != 0) {

            // Maybe the filesystem was optimistic: retry.

            enough_space = false;