commit e814b43c581b16e144328c405a003ffece9ebf4d
author Elliott Hughes <enh@google.com> Sat May 16 00:26:09 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 16 00:26:09 2015 +0000
tree ae4be5525cdb1dae3f05422b1b0f59e1235cfad3
parent 553cbb254478e7875aa3e4a95838b1811095e328
parent 997abb668b9248c2174c6cf169a0b7c6a02fd2cb

Merge "Don't use TEMP_FAILURE_RETRY on close in frameworks/native."

cmds/bugreport/bugreport.cpp

diff --git a/cmds/bugreport/bugreport.cpp b/cmds/bugreport/bugreport.cpp
index b606406..6892b57 100644
--- a/cmds/bugreport/bugreport.cpp
+++ b/cmds/bugreport/bugreport.cpp
@@ -86,6 +86,6 @@
     } while (bytes_written != 0 && bytes_to_send > 0);
   }
 
-  TEMP_FAILURE_RETRY(close(s));
+  close(s);
   return 0;
 }

cmds/dumpstate/utils.c

diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index 4fc23aa..44ba025 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -306,7 +306,7 @@
             }
         }
     }
-    TEMP_FAILURE_RETRY(close(fd));
+    close(fd);
 
     if (!newline) printf("\n");
     if (title) printf("\n");