Rename InterfacePtr's WaitForIncomingMethodCall() -> WaitForIncomingResponse().

mojo/services/files/public/c/lib/file_fd_impl.cc

 // Copyright 2015 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 "files/public/c/lib/file_fd_impl.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <limits>
@@ skipping 15 matching lines @@
 
 FileFDImpl::~FileFDImpl() {
 }
 
 bool FileFDImpl::Close() {
   ErrnoImpl::Setter errno_setter(errno_impl());
   MOJO_DCHECK(file_);
 
   mojo::files::Error error = mojo::files::ERROR_INTERNAL;
   file_->Close(Capture(&error));
-  if (!file_.WaitForIncomingMethodCall())
+  if (!file_.WaitForIncomingResponse())
     return errno_setter.Set(ESTALE);
   return errno_setter.Set(ErrorToErrno(error));
 }
 
 std::unique_ptr<FDImpl> FileFDImpl::Dup() {
   ErrnoImpl::Setter errno_setter(errno_impl());
   MOJO_DCHECK(file_);
 
   mojo::files::FilePtr new_file;
   mojo::files::Error error = mojo::files::ERROR_INTERNAL;
   file_->Dup(mojo::GetProxy(&new_file), Capture(&error));
-  if (!file_.WaitForIncomingMethodCall()) {
+  if (!file_.WaitForIncomingResponse()) {
     errno_setter.Set(ESTALE);
     return nullptr;
   }
   if (!errno_setter.Set(ErrorToErrno(error)))
     return nullptr;
   // C++11, why don't you have make_unique?
   return std::unique_ptr<FDImpl>(new FileFDImpl(errno_impl(), new_file.Pass()));
 }
 
 bool FileFDImpl::Ftruncate(mojio_off_t length) {
   ErrnoImpl::Setter errno_setter(errno_impl());
   MOJO_DCHECK(file_);
 
   if (length < 0)
     return errno_setter.Set(EINVAL);
 
   mojo::files::Error error = mojo::files::ERROR_INTERNAL;
   file_->Truncate(static_cast<int64_t>(length), Capture(&error));
-  if (!file_.WaitForIncomingMethodCall())
+  if (!file_.WaitForIncomingResponse())
     return errno_setter.Set(ESTALE);
   return errno_setter.Set(ErrorToErrno(error));
 }
 
 mojio_off_t FileFDImpl::Lseek(mojio_off_t offset, int whence) {
   ErrnoImpl::Setter errno_setter(errno_impl());
   MOJO_DCHECK(file_);
 
   mojo::files::Whence mojo_whence;
   switch (whence) {
     case MOJIO_SEEK_SET:
       mojo_whence = mojo::files::WHENCE_FROM_START;
       break;
     case MOJIO_SEEK_CUR:
       mojo_whence = mojo::files::WHENCE_FROM_CURRENT;
       break;
     case MOJIO_SEEK_END:
       mojo_whence = mojo::files::WHENCE_FROM_END;
       break;
     default:
       errno_setter.Set(EINVAL);
       return -1;
   }
 
   mojo::files::Error error = mojo::files::ERROR_INTERNAL;
   int64_t position = -1;
   file_->Seek(static_cast<int64_t>(offset), mojo_whence,
               Capture(&error, &position));
-  if (!file_.WaitForIncomingMethodCall()) {
+  if (!file_.WaitForIncomingResponse()) {
     errno_setter.Set(ESTALE);
     return -1;
   }
   if (!errno_setter.Set(ErrorToErrno(error)))
     return -1;
 
   if (position < 0) {
     // Service misbehaved.
     MOJO_LOG(ERROR) << "Write() wrote more than requested";
     // TODO(vtl): Is there a better error code for this?
@@ skipping 27 matching lines @@
 
   if (!buf && count > 0) {
     errno_setter.Set(EFAULT);
     return -1;
   }
 
   mojo::files::Error error = mojo::files::ERROR_INTERNAL;
   mojo::Array<uint8_t> bytes_read;
   file_->Read(static_cast<uint32_t>(count), 0, mojo::files::WHENCE_FROM_CURRENT,
               Capture(&error, &bytes_read));
-  if (!file_.WaitForIncomingMethodCall()) {
+  if (!file_.WaitForIncomingResponse()) {
     errno_setter.Set(ESTALE);
     return -1;
   }
   if (!errno_setter.Set(ErrorToErrno(error)))
     return -1;
   if (bytes_read.size() > count) {
     // Service misbehaved.
     MOJO_LOG(ERROR) << "Read() read more than requested";
     // TODO(vtl): Is there a better error code for this?
     errno_setter.Set(EIO);
@@ skipping 26 matching lines @@
 
   // TODO(vtl): Is there a more natural (or efficient) way to do this?
   mojo::Array<uint8_t> bytes_to_write(count);
   if (count > 0)
     memcpy(&bytes_to_write[0], buf, count);
 
   mojo::files::Error error = mojo::files::ERROR_INTERNAL;
   uint32_t num_bytes_written = 0;
   file_->Write(bytes_to_write.Pass(), 0, mojo::files::WHENCE_FROM_CURRENT,
                Capture(&error, &num_bytes_written));
-  if (!file_.WaitForIncomingMethodCall()) {
+  if (!file_.WaitForIncomingResponse()) {
     errno_setter.Set(ESTALE);
     return -1;
   }
   if (!errno_setter.Set(ErrorToErrno(error)))
     return -1;
 
   if (num_bytes_written > count) {
     // Service misbehaved.
     MOJO_LOG(ERROR) << "Write() wrote than requested";
     // TODO(vtl): Is there a better error code for this?
     errno_setter.Set(EIO);
     return -1;
   }
 
   return static_cast<mojio_ssize_t>(num_bytes_written);
 }
 
 bool FileFDImpl::Fstat(struct mojio_stat* buf) {
   ErrnoImpl::Setter errno_setter(errno_impl());
   MOJO_DCHECK(file_);
 
   if (!buf) {
     errno_setter.Set(EFAULT);
     return false;
   }
 
   mojo::files::FileInformationPtr file_info;
   mojo::files::Error error = mojo::files::ERROR_INTERNAL;
   file_->Stat(Capture(&error, &file_info));
-  if (!file_.WaitForIncomingMethodCall()) {
+  if (!file_.WaitForIncomingResponse()) {
     errno_setter.Set(ESTALE);
     return false;
   }
   if (!errno_setter.Set(ErrorToErrno(error)))
     return false;
 
   if (!file_info) {
     // Service misbehaved.
     MOJO_LOG(ERROR) << "Stat() didn't provide FileInformation";
     // TODO(vtl): Is there a better error code for this?
@@ skipping 42 matching lines @@
   // Make up a value based on size. (Note: Despite the above "block size", this
   // block count is for 512-byte blocks!)
   if (file_info->size > 0)
     buf->st_blocks = (static_cast<mojio_blkcnt_t>(file_info->size) + 511) / 512;
   // Else leave |st_blocks| zero.
 
   return true;
 }
 
 }  // namespace mojio