summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-05-15 19:16:40 -0700
committerElliott Hughes <enh@google.com>2015-05-27 13:27:06 -0700
commit9fc834377297cb2dcc418e4ce7e38e89dd09812b (patch)
tree8334eb54465c347db0ad9724ed6274abaed2dfd4 /init
parent93f6cba3ea078186473a448fe018167f4a8dcc5a (diff)
downloadsystem_core-9fc834377297cb2dcc418e4ce7e38e89dd09812b.zip
system_core-9fc834377297cb2dcc418e4ce7e38e89dd09812b.tar.gz
system_core-9fc834377297cb2dcc418e4ce7e38e89dd09812b.tar.bz2
Don't use TEMP_FAILURE_RETRY on close in system/core.
Bug: http://b/20501816 Change-Id: I1839b48ee4f891b8431ecb809e37a4566a5b3e50 (cherry picked from commit 47b0134ec2b5e8c8b5b5671cd4a3e41261275532)
Diffstat (limited to 'init')
-rw-r--r--init/util.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/util.cpp b/init/util.cpp
index b3947f7..a5392c6 100644
--- a/init/util.cpp
+++ b/init/util.cpp
@@ -170,7 +170,7 @@ bool read_file(const char* path, std::string* content) {
}
bool okay = android::base::ReadFdToString(fd, content);
- TEMP_FAILURE_RETRY(close(fd));
+ close(fd);
return okay;
}
@@ -184,7 +184,7 @@ int write_file(const char* path, const char* content) {
if (result == -1) {
NOTICE("write_file: Unable to write to '%s': %s\n", path, strerror(errno));
}
- TEMP_FAILURE_RETRY(close(fd));
+ close(fd);
return result;
}