commit d87304c6f5e707efe85d1e3379a926a500b14591
author Amin Hassani <ahassani@google.com> Tue Aug 29 11:40:03 2017 -0700
committer Sen Jiang <senj@google.com> Tue Oct 31 18:59:31 2017 -0700
tree 7659577963a3232874895e9578c8aaf52d4a4438
parent 6fbfd7d945c69dfa7d8fe0038d3128949723b9e9

update_engine: Fix lint issues in delta_performer.cc

This is necessary to allow repo upload succeed in the next cherry-picked
patch.

Bug: none
Test: FEATURES="test" emerge-amd64-generic update_engine

Change-Id: Ibf922e4fec6dc62b477588d0748ecaed60867b63
Reviewed-on: https://chromium-review.googlesource.com/641957
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
(cherry picked from commit 69583ba50b96d51c7206e834ff165a871c7f2ffd)

payload_consumer/delta_performer.cc

diff --git a/payload_consumer/delta_performer.cc b/payload_consumer/delta_performer.cc
index d6ac16c..c1afa44 100644
--- a/payload_consumer/delta_performer.cc
+++ b/payload_consumer/delta_performer.cc
@@ -24,6 +24,7 @@
 #include <cstring>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <base/files/file_util.h>
@@ -975,8 +976,8 @@
     for (uint64_t offset = 0; offset < length; offset += zeros.size()) {
       uint64_t chunk_length = min(length - offset,
                                   static_cast<uint64_t>(zeros.size()));
-      TEST_AND_RETURN_FALSE(
-          utils::PWriteAll(target_fd_, zeros.data(), chunk_length, start + offset));
+      TEST_AND_RETURN_FALSE(utils::PWriteAll(
+          target_fd_, zeros.data(), chunk_length, start + offset));
     }
   }
   return true;
@@ -1152,8 +1153,8 @@
     const uint64_t begin_byte =
         end_byte - (block_size_ - operation.dst_length() % block_size_);
     brillo::Blob zeros(end_byte - begin_byte);
-    TEST_AND_RETURN_FALSE(
-        utils::PWriteAll(target_fd_, zeros.data(), end_byte - begin_byte, begin_byte));
+    TEST_AND_RETURN_FALSE(utils::PWriteAll(
+        target_fd_, zeros.data(), end_byte - begin_byte, begin_byte));
   }
   return true;
 }