tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 8d592931: am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()"

Browse source 
* commit '8d592931a1a45e99ef963abc0dffc895739ef7ec':
  Don't use TEMP_FAILURE_RETRY on close()
This commit is contained in:
Nick Kralevich 2015-05-20 16:20:53 +00:00 committed by Android Git Automerger
commit 1610b953bb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
base/file.cpp
View file

@ -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);
}