Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Unified Diff: components/nacl/zygote/nacl_fork_delegate_linux.cc

Issue 100253002: Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/nacl/zygote/nacl_fork_delegate_linux.cc
diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.cc b/components/nacl/zygote/nacl_fork_delegate_linux.cc
index 9f6f7b4b1e7f26610f9339c9624e9edc4e27a398..1546bdd6f483a5be067e5a727cbb1596b8948344 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.cc
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.cc
@@ -206,7 +206,7 @@ void NaClForkDelegate::Init(const int sandboxdesc) {
status_ = kNaClHelperLaunchFailed;
// parent and error cases are handled below
}
- if (HANDLE_EINTR(close(fds[1])) != 0)
+ if (IGNORE_EINTR(close(fds[1])) != 0)
LOG(ERROR) << "close(fds[1]) failed";
if (status_ == kNaClHelperUnused) {
const ssize_t kExpectedLength = strlen(kNaClHelperStartupAck);
@@ -228,7 +228,7 @@ void NaClForkDelegate::Init(const int sandboxdesc) {
// TODO(bradchen): Make this LOG(ERROR) when the NaCl helper
// becomes the default.
fd_ = -1;
- if (HANDLE_EINTR(close(fds[0])) != 0)
+ if (IGNORE_EINTR(close(fds[0])) != 0)
LOG(ERROR) << "close(fds[0]) failed";
}
@@ -243,7 +243,7 @@ void NaClForkDelegate::InitialUMA(std::string* uma_name,
NaClForkDelegate::~NaClForkDelegate() {
// side effect of close: delegate process will terminate
if (status_ == kNaClHelperSuccess) {
- if (HANDLE_EINTR(close(fd_)) != 0)
+ if (IGNORE_EINTR(close(fd_)) != 0)
LOG(ERROR) << "close(fd_) failed";
}
}
« no previous file with comments | « components/nacl/loader/nacl_helper_linux.cc ('k') | content/browser/renderer_host/render_sandbox_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698