Random drive-by cleanup.

mojo/common/data_pipe_utils.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/common/data_pipe_utils.h"
 
 #include <stdio.h>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 11 matching lines @@
   for (;;) {
     const void* buffer = nullptr;
     uint32_t num_bytes = 0;
     MojoResult result = BeginReadDataRaw(
         source.get(), &buffer, &num_bytes, MOJO_READ_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_OK) {
       size_t bytes_written = write_bytes.Run(buffer, num_bytes);
       if (bytes_written < num_bytes) {
         LOG(ERROR) << "write_bytes callback wrote fewer bytes ("
                    << bytes_written << ") written than expected (" << num_bytes
-                   << ") in BlockingCopyHelper "
-                   << "(pipe closed? out of disk space?)" << std::endl;
+                   << ") in BlockingCopyHelper (pipe closed? out of disk "
+                      "space?)";
+        // No need to call EndReadDataRaw(), since |source| will be closed.
         return false;
       }
       result = EndReadDataRaw(source.get(), num_bytes);
       if (result != MOJO_RESULT_OK) {
         LOG(ERROR) << "EndReadDataRaw error (" << result
-                   << ") in BlockingCopyHelper" << std::endl;
+                   << ") in BlockingCopyHelper";
         return false;
       }
     } else if (result == MOJO_RESULT_SHOULD_WAIT) {
       result = Wait(source.get(),
                     MOJO_HANDLE_SIGNAL_READABLE,
                     MOJO_DEADLINE_INDEFINITE,
                     nullptr);
       if (result != MOJO_RESULT_OK) {
         // If the producer handle was closed, then treat as EOF.
         return result == MOJO_RESULT_FAILED_PRECONDITION;
       }
     } else if (result == MOJO_RESULT_FAILED_PRECONDITION) {
       // If the producer handle was closed, then treat as EOF.
       return true;
     } else {
-      LOG(ERROR) << "Unhandled error " << result << " in BlockingCopyHelper"
-                 << std::endl;
+      LOG(ERROR) << "Unhandled error " << result << " in BlockingCopyHelper";
       // Some other error occurred.
-      break;
+      return false;
     }
   }
-
-  return false;
 }
 
 size_t CopyToStringHelper(
     std::string* result, const void* buffer, uint32_t num_bytes) {
   result->append(static_cast<const char*>(buffer), num_bytes);
   return num_bytes;
 }
 
 size_t CopyToFileHelper(FILE* fp, const void* buffer, uint32_t num_bytes) {
   return fwrite(buffer, 1, num_bytes, fp);
 }
 
 bool BlockingCopyFromFile(const base::FilePath& source,
                           ScopedDataPipeProducerHandle destination,
                           uint32_t skip) {
   base::File file(source, base::File::FLAG_OPEN | base::File::FLAG_READ);
   if (!file.IsValid())
     return false;
-  if (file.Seek(base::File::FROM_BEGIN, skip) != skip) {
+  if (file.Seek(base::File::FROM_BEGIN, skip) != skip)

[hansmuller1, 2015/03/11 22:02:01]

Maybe we should log errors for these failure modes?

[viettrungluu, 2015/03/11 23:58:23]

Done.

     return false;
-  }
   for (;;) {
     void* buffer = nullptr;
     uint32_t buffer_num_bytes = 0;
     MojoResult result =
         BeginWriteDataRaw(destination.get(), &buffer, &buffer_num_bytes,
                           MOJO_WRITE_DATA_FLAG_NONE);
     if (result == MOJO_RESULT_OK) {
       int bytes_read =
           file.ReadAtCurrentPos(static_cast<char*>(buffer), buffer_num_bytes);
       if (bytes_read >= 0) {
@@ skipping 65 matching lines @@
       return result == MOJO_RESULT_FAILED_PRECONDITION;
     }
   }
 }
 
 bool BlockingCopyToFile(ScopedDataPipeConsumerHandle source,
                         const base::FilePath& destination) {
   base::ScopedFILE fp(base::OpenFile(destination, "wb"));
   if (!fp) {
     LOG(ERROR) << "OpenFile('" << destination.value()
-               << "'failed in BlockingCopyToFile" << std::endl;
+               << "'failed in BlockingCopyToFile";
     return false;
   }
   return BlockingCopyHelper(
       source.Pass(), base::Bind(&CopyToFileHelper, fp.get()));
 }
 
 void CopyToFile(ScopedDataPipeConsumerHandle source,
                 const base::FilePath& destination,
                 base::TaskRunner* task_runner,
                 const base::Callback<void(bool)>& callback) {
@@ skipping 10 matching lines @@
                   base::TaskRunner* task_runner,
                   const base::Callback<void(bool)>& callback) {
   base::PostTaskAndReplyWithResult(task_runner, FROM_HERE,
                                    base::Bind(&BlockingCopyFromFile, source,
                                               base::Passed(&destination), skip),
                                    callback);
 }
 
 }  // namespace common
 }  // namespace mojo