From 451dd85fb204b5015c461eabc78722abd1c4252a Mon Sep 17 00:00:00 2001
From: Rom Lemarchand <romlem@google.com>
Date: Mon, 11 Mar 2013 13:19:17 -0700
Subject: [PATCH] liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY

Makes the code slightly more readable and avoids boilerplate.

Change-Id: I023d9a1e1de729deaec97c62a5ca7983b6918f94
---
 logwrapper/logwrap.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index d9247ecd5..b2abfe2ec 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -79,9 +79,7 @@ static int parent(const char *tag, int parent_read, int signal_fd, pid_t pid,
     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 @@ static int parent(const char *tag, int parent_read, int signal_fd, pid_t pid,
 
             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;