summaryrefslogtreecommitdiffstats
path: root/applypatch/applypatch.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-02-18 09:27:23 +0100
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-02-18 09:27:23 +0100
commit56bfd57e1a390378ac953c0b45160992ac957b11 (patch)
treeea1ff0307b7c05641f3c4c9a55dcc1b340dc7c33 /applypatch/applypatch.cpp
parentSnap for 4603395 from 974a6e80c63f9d17f98cba9fcbd3ddb918fe67a3 to pi-release (diff)
parentMerge "Skip the cache size check on host" am: 31bcd7c002 am: fb8496e3aa (diff)
downloadandroid_bootable_recovery-56bfd57e1a390378ac953c0b45160992ac957b11.tar
android_bootable_recovery-56bfd57e1a390378ac953c0b45160992ac957b11.tar.gz
android_bootable_recovery-56bfd57e1a390378ac953c0b45160992ac957b11.tar.bz2
android_bootable_recovery-56bfd57e1a390378ac953c0b45160992ac957b11.tar.lz
android_bootable_recovery-56bfd57e1a390378ac953c0b45160992ac957b11.tar.xz
android_bootable_recovery-56bfd57e1a390378ac953c0b45160992ac957b11.tar.zst
android_bootable_recovery-56bfd57e1a390378ac953c0b45160992ac957b11.zip
Diffstat (limited to 'applypatch/applypatch.cpp')
-rw-r--r--applypatch/applypatch.cpp5
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);