Merge "updater: Clean up the header lines computation." am: a5735e9b5f
am: 1e29bb6717
Change-Id: I48a43bb615d9850375774b6827bc34352b0b7c76
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 236644e..48d1f4e 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1666,7 +1666,6 @@
return StringValue("t");
}
- size_t start = 2;
if (lines.size() < 4) {
ErrorAbort(state, kArgsParsingFailure, "too few lines in the transfer list [%zu]",
lines.size());
@@ -1708,8 +1707,6 @@
saved_last_command_index = -1;
}
- start += 2;
-
// Build a map of the available commands
std::unordered_map<std::string, const Command*> cmd_map;
for (size_t i = 0; i < cmdcount; ++i) {
@@ -1722,17 +1719,18 @@
int rc = -1;
+ static constexpr size_t kTransferListHeaderLines = 4;
// Subsequent lines are all individual transfer commands
- for (size_t i = start; i < lines.size(); i++) {
+ for (size_t i = kTransferListHeaderLines; i < lines.size(); i++) {
const std::string& line = lines[i];
if (line.empty()) continue;
params.tokens = android::base::Split(line, " ");
params.cpos = 0;
- if (i - start > std::numeric_limits<int>::max()) {
+ if (i - kTransferListHeaderLines > std::numeric_limits<int>::max()) {
params.cmdindex = -1;
} else {
- params.cmdindex = i - start;
+ params.cmdindex = i - kTransferListHeaderLines;
}
params.cmdname = params.tokens[params.cpos++].c_str();
params.cmdline = line.c_str();