diff options
Diffstat (limited to 'components/breakpad/browser/crash_handler_host_linux.cc')
-rw-r--r-- | components/breakpad/browser/crash_handler_host_linux.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/components/breakpad/browser/crash_handler_host_linux.cc b/components/breakpad/browser/crash_handler_host_linux.cc index b8794d2..cefcd19 100644 --- a/components/breakpad/browser/crash_handler_host_linux.cc +++ b/components/breakpad/browser/crash_handler_host_linux.cc @@ -108,8 +108,8 @@ CrashHandlerHostLinux::CrashHandlerHostLinux(const std::string& process_type, } CrashHandlerHostLinux::~CrashHandlerHostLinux() { - (void) HANDLE_EINTR(close(process_socket_)); - (void) HANDLE_EINTR(close(browser_socket_)); + close(process_socket_); + close(browser_socket_); } void CrashHandlerHostLinux::StartUploaderThread() { @@ -236,7 +236,7 @@ void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) { LOG(ERROR) << "Death signal contained wrong number of descriptors;" << " num_fds:" << num_fds; for (unsigned i = 0; i < num_fds; ++i) - (void) HANDLE_EINTR(close(reinterpret_cast<int*>(CMSG_DATA(hdr))[i])); + close(reinterpret_cast<int*>(CMSG_DATA(hdr))[i]); return; } else { partner_fd = reinterpret_cast<int*>(CMSG_DATA(hdr))[0]; @@ -253,9 +253,9 @@ void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) { LOG(ERROR) << "Death signal message didn't contain all expected control" << " messages"; if (partner_fd >= 0) - (void) HANDLE_EINTR(close(partner_fd)); + close(partner_fd); if (signal_fd >= 0) - (void) HANDLE_EINTR(close(signal_fd)); + close(signal_fd); return; } @@ -273,17 +273,17 @@ void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) { ino_t inode_number; if (!base::FileDescriptorGetInode(&inode_number, partner_fd)) { LOG(WARNING) << "Failed to get inode number for passed socket"; - (void) HANDLE_EINTR(close(partner_fd)); - (void) HANDLE_EINTR(close(signal_fd)); + close(partner_fd); + close(signal_fd); return; } - (void) HANDLE_EINTR(close(partner_fd)); + close(partner_fd); pid_t actual_crashing_pid = -1; if (!base::FindProcessHoldingSocket(&actual_crashing_pid, inode_number)) { LOG(WARNING) << "Failed to find process holding other end of crash reply " "socket"; - (void) HANDLE_EINTR(close(signal_fd)); + close(signal_fd); return; } @@ -442,7 +442,7 @@ void CrashHandlerHostLinux::QueueCrashDumpTask(BreakpadInfo* info, msg.msg_iovlen = 1; (void) HANDLE_EINTR(sendmsg(signal_fd, &msg, MSG_DONTWAIT | MSG_NOSIGNAL)); - (void) HANDLE_EINTR(close(signal_fd)); + close(signal_fd); uploader_thread_->message_loop()->PostTask( FROM_HERE, |