commit 387742d924306156f5693f8e3ca749f474ece8cb
author Rom Lemarchand <romlem@google.com> Tue Mar 12 23:14:22 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 12 23:14:22 2013 +0000
tree 5e82b99ae0d75c847624ba5e2e05bb1beeca0efc
parent fcd0987a4a047318377c6b77363ecbf645293951
parent 914b65fcb9d445059a1b51ce5ecd7552e0ea8c8b

am 914b65fc: am 451dd85f: liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY

* commit '914b65fcb9d445059a1b51ce5ecd7552e0ea8c8b':
  liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY

logwrapper/logwrap.c

diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index d9247ec..b2abfe2 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -79,9 +79,7 @@
     pthread_sigmask(SIG_UNBLOCK, &chldset, NULL);
 
     while (!found_child) {
-        if (poll(poll_fds, remote_hung ? 1 : 2, -1) < 0) {
-            if (errno == EINTR)
-                continue;
+        if (TEMP_FAILURE_RETRY(poll(poll_fds, remote_hung ? 1 : 2, -1)) < 0) {
             ERROR("poll failed\n");
             rc = -1;
             goto err_poll;
@@ -132,9 +130,7 @@
 
             read(signal_fd, tmp, sizeof(tmp));
             while (!found_child) {
-                do {
-                    ret = waitpid(-1, &status, WNOHANG);
-                } while (ret < 0 && errno == EINTR);
+                ret = TEMP_FAILURE_RETRY(waitpid(-1, &status, WNOHANG));
 
                 if (ret <= 0)
                     break;