diff options
author | Tianjie Xu <xunchang@google.com> | 2018-02-17 01:29:07 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-17 01:29:07 +0100 |
commit | fb8496e3aa2f202b6e1883e79fcb31e04282907d (patch) | |
tree | ed61c1e7c2d9b8708ee643156d226028f01cfd03 /applypatch/applypatch.cpp | |
parent | Merge "recovery: Porting screensave mode for new platform." (diff) | |
parent | Merge "Skip the cache size check on host" (diff) | |
download | android_bootable_recovery-fb8496e3aa2f202b6e1883e79fcb31e04282907d.tar android_bootable_recovery-fb8496e3aa2f202b6e1883e79fcb31e04282907d.tar.gz android_bootable_recovery-fb8496e3aa2f202b6e1883e79fcb31e04282907d.tar.bz2 android_bootable_recovery-fb8496e3aa2f202b6e1883e79fcb31e04282907d.tar.lz android_bootable_recovery-fb8496e3aa2f202b6e1883e79fcb31e04282907d.tar.xz android_bootable_recovery-fb8496e3aa2f202b6e1883e79fcb31e04282907d.tar.zst android_bootable_recovery-fb8496e3aa2f202b6e1883e79fcb31e04282907d.zip |
Diffstat (limited to 'applypatch/applypatch.cpp')
-rw-r--r-- | applypatch/applypatch.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 04b964b17..73701abc9 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -450,9 +450,8 @@ int CacheSizeCheck(size_t bytes) { if (MakeFreeSpaceOnCache(bytes) < 0) { printf("unable to make %zu bytes available on /cache\n", bytes); return 1; - } else { - return 0; } + return 0; } // This function applies binary patches to EMMC target files in a way that is safe (the original @@ -477,7 +476,7 @@ int CacheSizeCheck(size_t bytes) { // become obsolete since we have dropped the support for patching non-EMMC targets (EMMC targets // have the size embedded in the filename). int applypatch(const char* source_filename, const char* target_filename, - const char* target_sha1_str, size_t target_size __unused, + const char* target_sha1_str, size_t /* target_size */, const std::vector<std::string>& patch_sha1_str, const std::vector<std::unique_ptr<Value>>& patch_data, const Value* bonus_data) { printf("patch %s: ", source_filename); |