summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-06-09 11:32:03 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-06-09 11:32:03 +0200
commit44e8b33826e44bf59a7d331f1574038c0b1ed8f3 (patch)
tree84de8c12121c2a8979b2bfdde2486a8f0ef9e316 /updater
parentSnap for 4829746 from 4b5dc30a92ce528b65b99da6aad0bfb45ebafa8a to qt-release (diff)
parentMerge "updater: Remove the redundant check on line count." am: 4a8f5ec06d am: 165a197cdf (diff)
downloadandroid_bootable_recovery-44e8b33826e44bf59a7d331f1574038c0b1ed8f3.tar
android_bootable_recovery-44e8b33826e44bf59a7d331f1574038c0b1ed8f3.tar.gz
android_bootable_recovery-44e8b33826e44bf59a7d331f1574038c0b1ed8f3.tar.bz2
android_bootable_recovery-44e8b33826e44bf59a7d331f1574038c0b1ed8f3.tar.lz
android_bootable_recovery-44e8b33826e44bf59a7d331f1574038c0b1ed8f3.tar.xz
android_bootable_recovery-44e8b33826e44bf59a7d331f1574038c0b1ed8f3.tar.zst
android_bootable_recovery-44e8b33826e44bf59a7d331f1574038c0b1ed8f3.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/blockimg.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index f2811bccf..1646b7c17 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1628,9 +1628,10 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
}
}
+ static constexpr size_t kTransferListHeaderLines = 4;
std::vector<std::string> lines = android::base::Split(transfer_list_value->data, "\n");
- if (lines.size() < 2) {
- ErrorAbort(state, kArgsParsingFailure, "too few lines in the transfer list [%zd]",
+ if (lines.size() < kTransferListHeaderLines) {
+ ErrorAbort(state, kArgsParsingFailure, "too few lines in the transfer list [%zu]",
lines.size());
return StringValue("");
}
@@ -1654,12 +1655,6 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
return StringValue("t");
}
- if (lines.size() < 4) {
- ErrorAbort(state, kArgsParsingFailure, "too few lines in the transfer list [%zu]",
- lines.size());
- return StringValue("");
- }
-
// Third line is how many stash entries are needed simultaneously.
LOG(INFO) << "maximum stash entries " << lines[2];
@@ -1698,7 +1693,6 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
int rc = -1;
- static constexpr size_t kTransferListHeaderLines = 4;
// Subsequent lines are all individual transfer commands
for (size_t i = kTransferListHeaderLines; i < lines.size(); i++) {
const std::string& line = lines[i];