summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-08-26 23:10:23 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 23:10:23 +0200
commit5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5 (patch)
treeaacb123561249da7bf9d2a5c866244278ca94a47
parentam 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package" (diff)
parentMerge "updater: Remove the unused isunresumable in SaveStash()." (diff)
downloadandroid_bootable_recovery-5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5.tar
android_bootable_recovery-5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5.tar.gz
android_bootable_recovery-5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5.tar.bz2
android_bootable_recovery-5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5.tar.lz
android_bootable_recovery-5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5.tar.xz
android_bootable_recovery-5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5.tar.zst
android_bootable_recovery-5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5.zip
-rwxr-xr-xupdater/blockimg.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index d5c8bb195..7da9adf5f 100755
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -768,8 +768,8 @@ static int CreateStash(State* state, int maxblocks, const char* blockdev,
}
static int SaveStash(const std::string& base, char** wordsave, uint8_t** buffer,
- size_t* buffer_alloc, int fd, int usehash, bool* isunresumable) {
- if (!wordsave || !buffer || !buffer_alloc || !isunresumable) {
+ size_t* buffer_alloc, int fd, bool usehash) {
+ if (!wordsave || !buffer || !buffer_alloc) {
return -1;
}
@@ -1129,7 +1129,7 @@ static int PerformCommandStash(CommandParameters* params) {
}
return SaveStash(params->stashbase, &params->cpos, &params->buffer, &params->bufsize,
- params->fd, (params->version >= 3), &params->isunresumable);
+ params->fd, (params->version >= 3));
}
static int PerformCommandFree(CommandParameters* params) {