diff options
author | Elliott Hughes <enh@google.com> | 2015-05-15 19:16:40 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2015-05-27 13:27:06 -0700 |
commit | 9fc834377297cb2dcc418e4ce7e38e89dd09812b (patch) | |
tree | 8334eb54465c347db0ad9724ed6274abaed2dfd4 /debuggerd | |
parent | 93f6cba3ea078186473a448fe018167f4a8dcc5a (diff) | |
download | system_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 'debuggerd')
-rw-r--r-- | debuggerd/debuggerd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index 039b8ec..b84a4e5 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -279,7 +279,7 @@ static bool is32bit(pid_t tid) { char ehdr[EI_NIDENT]; ssize_t bytes = TEMP_FAILURE_RETRY(read(fd, &ehdr, sizeof(ehdr))); - TEMP_FAILURE_RETRY(close(fd)); + close(fd); if (bytes != (ssize_t) sizeof(ehdr) || memcmp(ELFMAG, ehdr, SELFMAG) != 0) { return false; } @@ -304,14 +304,14 @@ static void redirect_to_32(int fd, debugger_request_t* request) { if (TEMP_FAILURE_RETRY(write(sock_fd, &msg, sizeof(msg))) != (ssize_t) sizeof(msg)) { ALOGE("Failed to write request to debuggerd32 socket: %s", strerror(errno)); - TEMP_FAILURE_RETRY(close(sock_fd)); + close(sock_fd); return; } char ack; if (TEMP_FAILURE_RETRY(read(sock_fd, &ack, 1)) == -1) { ALOGE("Failed to read ack from debuggerd32 socket: %s", strerror(errno)); - TEMP_FAILURE_RETRY(close(sock_fd)); + close(sock_fd); return; } @@ -338,7 +338,7 @@ static void redirect_to_32(int fd, debugger_request_t* request) { break; } } - TEMP_FAILURE_RETRY(close(sock_fd)); + close(sock_fd); } #endif @@ -365,7 +365,7 @@ static void handle_request(int fd) { ALOGE("debuggerd: Not allowed to redirect action %d to 32 bit debuggerd\n", request.action); } - TEMP_FAILURE_RETRY(close(fd)); + close(fd); return; } #endif |