summaryrefslogtreecommitdiffstats
path: root/libcutils
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 /libcutils
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 'libcutils')
-rw-r--r--libcutils/debugger.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcutils/debugger.c b/libcutils/debugger.c
index 4558719..3407ec3 100644
--- a/libcutils/debugger.c
+++ b/libcutils/debugger.c
@@ -68,7 +68,7 @@ static int make_dump_request(debugger_action_t action, pid_t tid, int timeout_se
}
if (send_request(sock_fd, &msg, sizeof(msg)) < 0) {
- TEMP_FAILURE_RETRY(close(sock_fd));
+ close(sock_fd);
return -1;
}
@@ -95,7 +95,7 @@ int dump_backtrace_to_file_timeout(pid_t tid, int fd, int timeout_secs) {
break;
}
}
- TEMP_FAILURE_RETRY(close(sock_fd));
+ close(sock_fd);
return result;
}
@@ -124,6 +124,6 @@ int dump_tombstone_timeout(pid_t tid, char* pathbuf, size_t pathlen, int timeout
memcpy(pathbuf, buffer, n + 1);
}
}
- TEMP_FAILURE_RETRY(close(sock_fd));
+ close(sock_fd);
return result;
}