From 036dec3eccf7fd2a6d4edf8bb1f0f4242c360766 Mon Sep 17 00:00:00 2001
From: "mark@chromium.org"
 <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>
Date: Tue, 3 Dec 2013 14:12:08 +0000
Subject: Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close.

It is incorrect to wrap close in HANDLE_EINTR on Linux.

Unnecessary #includes of eintr_wrapper.h are also removed. The variable naming
within the macro is also updated per Chromium r178174.

einter_wrapper.h contains a non-mechanical change. Mechanical changes were
generated by running:

sed -E -i '' \
    -e 's/((=|if|return|CHECK|EXPECT|ASSERT).*)HANDLE(_EINTR\(.*close)/\1IGNORE\3/' \
    -e 's/(ignore_result|void ?)\(HANDLE_EINTR\((.*close\(.*)\)\)/\2/' \
    -e 's/(\(void\) ?)?HANDLE_EINTR\((.*close\(.*)\)/\2/' \
    $(grep -rl HANDLE_EINTR.*close . --exclude-dir=.svn)

sed -E -i '' -e '/#include.*eintr_wrapper\.h"/d' \
    $(grep -EL '(HANDLE|IGNORE)_EINTR' \
        $(grep -Elr '#include.*eintr_wrapper\.h"' . --exclude-dir=.svn))

BUG=chromium:269623
R=ted.mielczarek@gmail.com

Review URL: https://breakpad.appspot.com/784002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1239 4c0a9323-5329-0410-9bdc-e9ce6186880e
---
 src/common/tests/file_utils.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/common/tests')

diff --git a/src/common/tests/file_utils.cc b/src/common/tests/file_utils.cc
index 80a6b650..1c041777 100644
--- a/src/common/tests/file_utils.cc
+++ b/src/common/tests/file_utils.cc
@@ -51,7 +51,7 @@ bool CopyFile(const char* from_path, const char* to_path) {
   int outfile = HANDLE_EINTR(creat(to_path, 0666));
   if (outfile < 0) {
     perror("creat");
-    if (HANDLE_EINTR(close(infile)) < 0) {
+    if (IGNORE_EINTR(close(infile)) < 0) {
       perror("close");
     }
     return false;
@@ -84,11 +84,11 @@ bool CopyFile(const char* from_path, const char* to_path) {
     } while (bytes_written_per_read < bytes_read);
   }
 
-  if (HANDLE_EINTR(close(infile)) == -1) {
+  if (IGNORE_EINTR(close(infile)) == -1) {
     perror("close");
     result = false;
   }
-  if (HANDLE_EINTR(close(outfile)) == -1) {
+  if (IGNORE_EINTR(close(outfile)) == -1) {
     perror("close");
     result = false;
   }
@@ -112,7 +112,7 @@ bool ReadFile(const char* path, void* buffer, ssize_t* buffer_size) {
       ok = false;
     }
   }
-  if (HANDLE_EINTR(close(fd)) == -1) {
+  if (IGNORE_EINTR(close(fd)) == -1) {
     perror("close");
     ok = false;
   }
@@ -143,7 +143,7 @@ bool WriteFile(const char* path, const void* buffer, size_t buffer_size) {
       bytes_written_total += bytes_written_partial;
     }
   }
-  if (HANDLE_EINTR(close(fd)) == -1) {
+  if (IGNORE_EINTR(close(fd)) == -1) {
     perror("close");
     ok = false;
   }
-- 
cgit v1.2.1