commit 165c6ad300380fcd132a676f809560a606894e52
author Tao Bao <tbao@google.com> Wed Aug 26 21:17:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 21:17:00 2015 +0000
tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 1a3ccc881f451ff733a587b9fac8d73a83c12dfd
parent 5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5

am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."

* commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5':
  updater: Remove the unused isunresumable in SaveStash().

updater/blockimg.cpp

diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index d5c8bb1..7da9adf 100755
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -768,8 +768,8 @@
 }
 
 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 @@
     }
 
     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) {