diff options
author | Elliott Hughes <enh@google.com> | 2015-05-15 08:25:58 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-05-15 10:00:23 -0700 |
commit | 577d24cc9e330afb21ab7a5f0d95f84b88745e55 (patch) | |
tree | b66cff7c9c16412a2c478753aa20815021e3ceb3 /runtime/base | |
parent | 88bf23f0c78c803ef7eb3e9cdf7a89e8f364a10c (diff) | |
download | art-577d24cc9e330afb21ab7a5f0d95f84b88745e55.tar.gz art-577d24cc9e330afb21ab7a5f0d95f84b88745e55.tar.bz2 art-577d24cc9e330afb21ab7a5f0d95f84b88745e55.zip |
Stop wrapping close(2) with TEMP_FAILURE_RETRY in art.
Note that all the TEMP_FAILURE_RETRY([A-Z] calls in this file are
wrong. The member functions return -errno, so only an EPERM failure
will return -1 (but errno should be EPERM, so you won't loop).
Bug: http://b/20501816
Change-Id: Ibde6a2c7bf92469d008d6d510f9391669ae37a84
(cherry picked from commit 6a887d6a1d1ca089b48663a5ae11f973b98785a9)
Diffstat (limited to 'runtime/base')
-rw-r--r-- | runtime/base/unix_file/fd_file.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/base/unix_file/fd_file.cc b/runtime/base/unix_file/fd_file.cc index f272d88807..07cadc48d6 100644 --- a/runtime/base/unix_file/fd_file.cc +++ b/runtime/base/unix_file/fd_file.cc @@ -107,7 +107,7 @@ bool FdFile::Open(const std::string& path, int flags, mode_t mode) { } int FdFile::Close() { - int result = TEMP_FAILURE_RETRY(close(fd_)); + int result = close(fd_); // Test here, so the file is closed and not leaked. if (kCheckSafeUsage) { |