Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95db36e1 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Don't use TEMP_FAILURE_RETRY on close() 

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

Bug: 20501816
Change-Id: I38bf5052f44034c6f866d10d7d07187f0053a7a1
parent fe5b2513

base/file.cpp

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ bool ReadFileToString(const std::string& path, std::string* content) { 
    return false;

  }

  bool result = ReadFdToString(fd, content);

  TEMP_FAILURE_RETRY(close(fd));

  close(fd);

  return result;

}
@@ -102,7 +102,7 @@ bool WriteStringToFile(const std::string& content, const std::string& path, 
    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 WriteStringToFile(const std::string& content, const std::string& path) { 
  }



  bool result = WriteStringToFd(content, fd);

  TEMP_FAILURE_RETRY(close(fd));

  close(fd);

  return result || CleanUpAfterFailedWrite(path);

}