diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/address_tracker_linux.cc | 2 | ||||
| -rw-r--r-- | net/base/net_util_posix.cc | 1 | ||||
| -rw-r--r-- | net/dns/address_sorter_posix.cc | 1 | ||||
| -rw-r--r-- | net/socket/tcp_listen_socket_unittest.cc | 2 | ||||
| -rw-r--r-- | net/socket/tcp_socket_libevent.cc | 4 | ||||
| -rw-r--r-- | net/socket/unix_domain_socket_posix.cc | 4 | ||||
| -rw-r--r-- | net/socket/unix_domain_socket_posix_unittest.cc | 2 | ||||
| -rw-r--r-- | net/udp/udp_socket_libevent.cc | 2 | ||||
| -rw-r--r-- | net/udp/udp_socket_win.cc | 1 |
9 files changed, 8 insertions, 11 deletions
diff --git a/net/base/address_tracker_linux.cc b/net/base/address_tracker_linux.cc index 886811a..f863ccd 100644 --- a/net/base/address_tracker_linux.cc +++ b/net/base/address_tracker_linux.cc @@ -306,7 +306,7 @@ void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { void AddressTrackerLinux::OnFileCanWriteWithoutBlocking(int /* fd */) {} void AddressTrackerLinux::CloseSocket() { - if (netlink_fd_ >= 0 && HANDLE_EINTR(close(netlink_fd_)) < 0) + if (netlink_fd_ >= 0 && IGNORE_EINTR(close(netlink_fd_)) < 0) PLOG(ERROR) << "Could not close NETLINK socket."; netlink_fd_ = -1; } diff --git a/net/base/net_util_posix.cc b/net/base/net_util_posix.cc index 4882ff6..4ff3ee9 100644 --- a/net/base/net_util_posix.cc +++ b/net/base/net_util_posix.cc @@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/logging.h" -#include "base/posix/eintr_wrapper.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" diff --git a/net/dns/address_sorter_posix.cc b/net/dns/address_sorter_posix.cc index c4bf74d..5e2fe94 100644 --- a/net/dns/address_sorter_posix.cc +++ b/net/dns/address_sorter_posix.cc @@ -19,7 +19,6 @@ #include "base/logging.h" #include "base/memory/scoped_vector.h" -#include "base/posix/eintr_wrapper.h" #include "net/socket/client_socket_factory.h" #include "net/udp/datagram_client_socket.h" diff --git a/net/socket/tcp_listen_socket_unittest.cc b/net/socket/tcp_listen_socket_unittest.cc index 2410677..41c41f8 100644 --- a/net/socket/tcp_listen_socket_unittest.cc +++ b/net/socket/tcp_listen_socket_unittest.cc @@ -73,7 +73,7 @@ void TCPListenSocketTester::TearDown() { #if defined(OS_WIN) ASSERT_EQ(0, closesocket(test_socket_)); #elif defined(OS_POSIX) - ASSERT_EQ(0, HANDLE_EINTR(close(test_socket_))); + ASSERT_EQ(0, IGNORE_EINTR(close(test_socket_))); #endif NextAction(); ASSERT_EQ(ACTION_CLOSE, last_action_.type()); diff --git a/net/socket/tcp_socket_libevent.cc b/net/socket/tcp_socket_libevent.cc index ab96afb..f4e4fe8 100644 --- a/net/socket/tcp_socket_libevent.cc +++ b/net/socket/tcp_socket_libevent.cc @@ -521,7 +521,7 @@ void TCPSocketLibevent::Close() { DCHECK(ok); if (socket_ != kInvalidSocket) { - if (HANDLE_EINTR(close(socket_)) < 0) + if (IGNORE_EINTR(close(socket_)) < 0) PLOG(ERROR) << "close"; socket_ = kInvalidSocket; } @@ -590,7 +590,7 @@ int TCPSocketLibevent::AcceptInternal(scoped_ptr<TCPSocketLibevent>* socket, IPEndPoint ip_end_point; if (!ip_end_point.FromSockAddr(storage.addr, storage.addr_len)) { NOTREACHED(); - if (HANDLE_EINTR(close(new_socket)) < 0) + if (IGNORE_EINTR(close(new_socket)) < 0) PLOG(ERROR) << "close"; net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, ERR_ADDRESS_INVALID); diff --git a/net/socket/unix_domain_socket_posix.cc b/net/socket/unix_domain_socket_posix.cc index 2b781d5..3141f71 100644 --- a/net/socket/unix_domain_socket_posix.cc +++ b/net/socket/unix_domain_socket_posix.cc @@ -130,7 +130,7 @@ SocketDescriptor UnixDomainSocket::CreateAndBind(const std::string& path, LOG(ERROR) << "Could not bind unix domain socket to " << path; if (use_abstract_namespace) LOG(ERROR) << " (with abstract namespace enabled)"; - if (HANDLE_EINTR(close(s)) < 0) + if (IGNORE_EINTR(close(s)) < 0) LOG(ERROR) << "close() error"; return kInvalidSocket; } @@ -145,7 +145,7 @@ void UnixDomainSocket::Accept() { gid_t group_id; if (!GetPeerIds(conn, &user_id, &group_id) || !auth_callback_.Run(user_id, group_id)) { - if (HANDLE_EINTR(close(conn)) < 0) + if (IGNORE_EINTR(close(conn)) < 0) LOG(ERROR) << "close() error"; return; } diff --git a/net/socket/unix_domain_socket_posix_unittest.cc b/net/socket/unix_domain_socket_posix_unittest.cc index 6520985..b1857e6 100644 --- a/net/socket/unix_domain_socket_posix_unittest.cc +++ b/net/socket/unix_domain_socket_posix_unittest.cc @@ -306,7 +306,7 @@ TEST_F(UnixDomainSocketTest, TestWithClient) { ASSERT_EQ(kMsg, socket_delegate_->ReceivedData()); // Close the client socket. - ret = HANDLE_EINTR(close(sock)); + ret = IGNORE_EINTR(close(sock)); event = event_manager_->WaitForEvent(); ASSERT_EQ(EVENT_CLOSE, event); } diff --git a/net/udp/udp_socket_libevent.cc b/net/udp/udp_socket_libevent.cc index 990aa57..7ef9c3c 100644 --- a/net/udp/udp_socket_libevent.cc +++ b/net/udp/udp_socket_libevent.cc @@ -83,7 +83,7 @@ void UDPSocketLibevent::Close() { ok = write_socket_watcher_.StopWatchingFileDescriptor(); DCHECK(ok); - if (HANDLE_EINTR(close(socket_)) < 0) + if (IGNORE_EINTR(close(socket_)) < 0) PLOG(ERROR) << "close"; socket_ = kInvalidSocket; diff --git a/net/udp/udp_socket_win.cc b/net/udp/udp_socket_win.cc index c9f30a7..d2745b9 100644 --- a/net/udp/udp_socket_win.cc +++ b/net/udp/udp_socket_win.cc @@ -11,7 +11,6 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" -#include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" |