diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:33:29 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:33:29 +0000 |
| commit | ec7d5d68dca09e02c5d70bb9af741721c9ac0fa0 (patch) | |
| tree | 326c75e7d2eb93ec89461844b5b36287aac957a5 /ipc | |
| parent | 03c0febeb67a6e4247d84091d16d2a0241afea7e (diff) | |
| download | chromium_src-ec7d5d68dca09e02c5d70bb9af741721c9ac0fa0.zip chromium_src-ec7d5d68dca09e02c5d70bb9af741721c9ac0fa0.tar.gz chromium_src-ec7d5d68dca09e02c5d70bb9af741721c9ac0fa0.tar.bz2 | |
Revert 49989 - x
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2822013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/file_descriptor_set_posix.cc | 6 | ||||
| -rw-r--r-- | ipc/ipc_channel_posix.cc | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ipc/file_descriptor_set_posix.cc b/ipc/file_descriptor_set_posix.cc index 7f17322..3796fae 100644 --- a/ipc/file_descriptor_set_posix.cc +++ b/ipc/file_descriptor_set_posix.cc @@ -30,8 +30,7 @@ FileDescriptorSet::~FileDescriptorSet() { for (unsigned i = consumed_descriptor_highwater_; i < descriptors_.size(); ++i) { if (descriptors_[i].auto_close) - if (HANDLE_EINTR(close(descriptors_[i].fd)) < 0) - PLOG(ERROR) << "close"; + HANDLE_EINTR(close(descriptors_[i].fd)); } } @@ -114,8 +113,7 @@ void FileDescriptorSet::CommitAll() { for (std::vector<base::FileDescriptor>::iterator i = descriptors_.begin(); i != descriptors_.end(); ++i) { if (i->auto_close) - if (HANDLE_EINTR(close(i->fd)) < 0) - PLOG(ERROR) << "close"; + HANDLE_EINTR(close(i->fd)); } descriptors_.clear(); consumed_descriptor_highwater_ = 0; diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 6e8e2642..2fc1a18 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -200,8 +200,7 @@ bool ServerAcceptFifoConnection(int server_listen_fd, int* server_socket) { if (accept_fd < 0) return false; if (fcntl(accept_fd, F_SETFL, O_NONBLOCK) == -1) { - if (HANDLE_EINTR(close(accept_fd)) < 0) - PLOG(ERROR) << "close"; + HANDLE_EINTR(close(accept_fd)); return false; } |