diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2015-02-09 12:53:18 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-02-11 06:00:18 +0000 |
| commit | f68bbbc952aa9a71898e4939b5f36187fa564a50 (patch) | |
| tree | 3927ffc053db9275a052ba2a370cbae62b5c236a /payload_generator/generate_delta_main.cc | |
| parent | 981a9fb68ec5fe56f57b3ecb117a0dc681bf5e83 (diff) | |
update_engine: replace std::vector<char> with chromeos::Blob
To make update engine consistent with the rest of platform2 code
replaced std::vector<char> as the container of binary data with
chromeos::Blob.
BUG=None
TEST=`FEATURES=test emerge-link update_engine`
Change-Id: I6385fd2257d15aa24bfa74ac35512c2a06c33012
Reviewed-on: https://chromium-review.googlesource.com/247793
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'payload_generator/generate_delta_main.cc')
| -rw-r--r-- | payload_generator/generate_delta_main.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc index c0dfe186..cbcbaf08 100644 --- a/payload_generator/generate_delta_main.cc +++ b/payload_generator/generate_delta_main.cc @@ -103,7 +103,7 @@ void CalculatePayloadHashForSigning(const vector<int> &sizes, LOG_IF(FATAL, out_hash_file.empty()) << "Must pass --out_hash_file to calculate hash for signing."; - vector<char> hash; + chromeos::Blob hash; bool result = PayloadSigner::HashPayloadForSigning(in_file, sizes, &hash); CHECK(result); @@ -123,7 +123,7 @@ void CalculateMetadataHashForSigning(const vector<int> &sizes, LOG_IF(FATAL, out_metadata_hash_file.empty()) << "Must pass --out_metadata_hash_file to calculate metadata hash."; - vector<char> hash; + chromeos::Blob hash; bool result = PayloadSigner::HashMetadataForSigning(in_file, sizes, &hash); CHECK(result); @@ -145,11 +145,11 @@ void SignPayload(const string& in_file, << "Must pass --out_file to sign payload."; LOG_IF(FATAL, signature_file.empty()) << "Must pass --signature_file to sign payload."; - vector<vector<char>> signatures; + vector<chromeos::Blob> signatures; vector<string> signature_files; base::SplitString(signature_file, ':', &signature_files); for (const string& signature_file : signature_files) { - vector<char> signature; + chromeos::Blob signature; CHECK(utils::ReadFile(signature_file, &signature)); signatures.push_back(signature); } @@ -201,16 +201,16 @@ void ApplyDelta(const string& in_file, DeltaPerformer performer(&prefs, nullptr, &install_plan); CHECK_EQ(performer.Open(old_image.c_str(), 0, 0), 0); CHECK(performer.OpenKernel(old_kernel.c_str())); - vector<char> buf(1024 * 1024); + chromeos::Blob buf(1024 * 1024); int fd = open(in_file.c_str(), O_RDONLY, 0); CHECK_GE(fd, 0); ScopedFdCloser fd_closer(&fd); for (off_t offset = 0;; offset += buf.size()) { ssize_t bytes_read; - CHECK(utils::PReadAll(fd, &buf[0], buf.size(), offset, &bytes_read)); + CHECK(utils::PReadAll(fd, buf.data(), buf.size(), offset, &bytes_read)); if (bytes_read == 0) break; - CHECK_EQ(performer.Write(&buf[0], bytes_read), bytes_read); + CHECK_EQ(performer.Write(buf.data(), bytes_read), bytes_read); } CHECK_EQ(performer.Close(), 0); DeltaPerformer::ResetUpdateProgress(&prefs, false); |