update_engine: Use C++11 range-based for loop when possible.
This cleanup just simplifies the notation of several for loops using
the new range-based syntax.
BUG=None
TEST=`FEATURES=test USE="lang clang" emerge-link update_engine`
Change-Id: I2120a1b1c3fd00e9a02a62abfa8427932080d0f9
Reviewed-on: https://chromium-review.googlesource.com/227897
Tested-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
diff --git a/payload_generator/payload_signer.cc b/payload_generator/payload_signer.cc
index d3afb86..a33c24f 100644
--- a/payload_generator/payload_signer.cc
+++ b/payload_generator/payload_signer.cc
@@ -36,9 +36,7 @@
<< kSignatureMessageOriginalVersion << ", "
<< kSignatureMessageCurrentVersion << "] inclusive, but you only "
<< "provided " << signatures.size() << " signatures.";
- for (vector<vector<char>>::const_iterator it = signatures.begin(),
- e = signatures.end(); it != e; ++it) {
- const vector<char>& signature = *it;
+ for (const vector<char>& signature : signatures) {
Signatures_Signature* sig_message = out_message.add_signatures();
sig_message->set_version(version++);
sig_message->set_data(signature.data(), signature.size());
@@ -177,10 +175,9 @@
utils::FileSize(unsigned_payload_path));
vector<vector<char>> signatures;
- for (vector<string>::const_iterator it = private_key_paths.begin(),
- e = private_key_paths.end(); it != e; ++it) {
+ for (const string& path : private_key_paths) {
vector<char> signature;
- TEST_AND_RETURN_FALSE(SignHash(hash_data, *it, &signature));
+ TEST_AND_RETURN_FALSE(SignHash(hash_data, path, &signature));
signatures.push_back(signature);
}
TEST_AND_RETURN_FALSE(ConvertSignatureToProtobufBlob(signatures,
@@ -216,10 +213,8 @@
// Loads the payload and adds the signature op to it.
vector<vector<char>> signatures;
- for (vector<int>::const_iterator it = signature_sizes.begin(),
- e = signature_sizes.end(); it != e; ++it) {
- vector<char> signature(*it, 0);
- signatures.push_back(signature);
+ for (int signature_size : signature_sizes) {
+ signatures.emplace_back(signature_size, 0);
}
vector<char> signature_blob;
TEST_AND_RETURN_FALSE(ConvertSignatureToProtobufBlob(signatures,