Don't HANDLE_EINTR(close). Either IGNORE_EINTR(close) or just close.

ppapi/tests/test_broker.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/tests/test_broker.h"
 
 #if defined(_MSC_VER)
 #define OS_WIN 1
 #include <windows.h>
 #else
@@ skipping 40 matching lines @@
 
 PlatformFile IntToPlatformFile(int32_t handle) {
 #if defined(OS_WIN)
   return reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle));
 #elif defined(OS_POSIX)
   return handle;
 #endif
 }
 
 #if defined(OS_POSIX)
+
 #define HANDLE_EINTR(x) ({ \
-  typeof(x) __eintr_result__; \
+  typeof(x) eintr_wrapper_result; \
   do { \
-    __eintr_result__ = x; \
-  } while (__eintr_result__ == -1 && errno == EINTR); \
-  __eintr_result__;\
+    eintr_wrapper_result = (x); \
+  } while (eintr_wrapper_result == -1 && errno == EINTR); \
+  eintr_wrapper_result; \
 })
+
+#define IGNORE_EINTR(x) ({ \
+  typeof(x) eintr_wrapper_result; \
+  do { \
+    eintr_wrapper_result = (x); \
+    if (eintr_wrapper_result == -1 && errno == EINTR) { \
+      eintr_wrapper_result = 0; \
+    } \
+  } while (0); \
+  eintr_wrapper_result; \
+})
+
 #endif
 
 bool ReadMessage(PlatformFile file, size_t message_len, char* message) {
 #if defined(OS_WIN)
   assert(message_len < std::numeric_limits<DWORD>::max());
   DWORD read = 0;
   const DWORD size = static_cast<DWORD>(message_len);
   return ::ReadFile(file, message, size, &read, NULL) && read == size;
 #elif defined(OS_POSIX)
   assert(message_len <
@@ skipping 36 matching lines @@
   bool success = ReadMessage(file, message_len, message_received) &&
                  !::strcmp(message_received, message);
   delete [] message_received;
   return success;
 }
 
 bool ClosePlatformFile(PlatformFile file) {
 #if defined(OS_WIN)
   return !!::CloseHandle(file);
 #elif defined(OS_POSIX)
-  return !HANDLE_EINTR(::close(file));
+  return !IGNORE_EINTR(::close(file));
 #endif
 }
 
 bool VerifyIsUnsandboxed() {
 #if defined(OS_WIN)
   FILE* file = NULL;
   wchar_t temp_path[MAX_PATH] = {'\0'};
   wchar_t file_name[MAX_PATH] = {'\0'};
   if (!::GetTempPath(MAX_PATH, temp_path) ||
       !::GetTempFileName(temp_path, L"test_pepper_broker", 0, file_name) ||
       ::_wfopen_s(&file, file_name, L"w"))
     return false;
 
   if (::fclose(file)) {
     ::DeleteFile(file_name);
     return false;
   }
 
   return !!::DeleteFile(file_name);
 #elif defined(OS_POSIX)
   char file_name[] = "/tmp/test_pepper_broker_XXXXXX";
   int fd = ::mkstemp(file_name);
   if (-1 == fd)
     return false;
 
-  if (HANDLE_EINTR(::close(fd))) {
+  if (IGNORE_EINTR(::close(fd))) {
     ::remove(file_name);
     return false;
   }
 
   return !::remove(file_name);
 #endif
 }
 
 // Callback in the broker when a new broker connection occurs.
 int32_t OnInstanceConnected(PP_Instance instance, int32_t handle) {
@@ skipping 169 matching lines @@
 }
 
 std::string TestBroker::TestIsAllowedPermissionGranted() {
   PP_Resource broker = broker_interface_->CreateTrusted(
       instance_->pp_instance());
   ASSERT_TRUE(broker);
   ASSERT_EQ(PP_TRUE, broker_interface_->IsAllowed(broker));
 
   PASS();
 }