am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()" (8d592931) · Commits · e / os / android_system_core

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