commit 7a1c0148a9bfbd15132c949f7758719027e9deb4
author Dimitry Ivanov <dimitry@google.com> Thu Mar 17 15:59:38 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Thu Mar 17 15:59:38 2016 -0700
tree ebd69eee5596e32bf18381801224a23bac809b4a
parent 275f97e225f534582b446eb7b9eb00c6757255d9

Remove TEMP_FAILURE_RETRY for unlink

unlink(2) does not generate EINTR error

Change-Id: I546b00a61b8ffcbd43b01f5ae6ff31f335be00ab

patchoat/patchoat.cc

diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index 1d80bda..b54e620 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -128,7 +128,7 @@
     if (f.get() != nullptr) {
       if (fchmod(f->Fd(), 0644) != 0) {
         PLOG(ERROR) << "Unable to make " << name << " world readable";
-        TEMP_FAILURE_RETRY(unlink(name));
+        unlink(name);
         return nullptr;
       }
     }
@@ -440,7 +440,7 @@
   }
 
   // Delete the original file, since we won't need it.
-  TEMP_FAILURE_RETRY(unlink(output_oat_filename.c_str()));
+  unlink(output_oat_filename.c_str());
 
   // Create a symlink from the old oat to the new oat
   if (symlink(input_oat_filename.c_str(), output_oat_filename.c_str()) < 0) {
@@ -1135,7 +1135,7 @@
     if (!success) {
       if (new_oat_out) {
         CHECK(!output_oat_filename.empty());
-        TEMP_FAILURE_RETRY(unlink(output_oat_filename.c_str()));
+        unlink(output_oat_filename.c_str());
       }
     }