commit b32834b8a183179ad2e0c160dce80210842dbd06
author Nick Kralevich <nnk@google.com> Wed May 20 08:59:21 2015 -0700
committer Nick Kralevich <nnk@google.com> Wed May 20 09:02:29 2015 -0700
tree 9be2a032ebf51872516e7816d1e2436d6a4b9431
parent fade9a908cd8140e6eff5be473daa04672b87343

Don't use TEMP_FAILURE_RETRY on close()

See https://lkml.org/lkml/2005/9/10/129 for details.

Bug: 20501816
Change-Id: I38bf5052f44034c6f866d10d7d07187f0053a7a1

base/file.cpp

diff --git a/base/file.cpp b/base/file.cpp
index 6b19818..9a340b7 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -51,7 +51,7 @@
     return false;
   }
   bool result = ReadFdToString(fd, content);
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return result;
 }
 
@@ -102,7 +102,7 @@
     ALOGE("android::WriteStringToFile write failed: %s", strerror(errno));
     return CleanUpAfterFailedWrite(path);
   }
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return true;
 }
 #endif
@@ -116,7 +116,7 @@
   }
 
   bool result = WriteStringToFd(content, fd);
-  TEMP_FAILURE_RETRY(close(fd));
+  close(fd);
   return result || CleanUpAfterFailedWrite(path);
 }