From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 5 Nov 2015 12:44:15 +0000 (+0100)
Subject: sd-resolve: simplify pthread_join() call
X-Git-Tag: v228~79^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5263a45b5cb3e51b95253a0eab789e33c4010f20;p=platform%2Fupstream%2Fsystemd.git

sd-resolve: simplify pthread_join() call

POSIX says:
The pthread_join() function shall not return an error code of [EINTR].
---

diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 4876760..34a0b03 100644
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -584,12 +584,8 @@ static void resolve_free(sd_resolve *resolve) {
         }
 
         /* Now terminate them and wait until they are gone. */
-        for (i = 0; i < resolve->n_valid_workers; i++) {
-                for (;;) {
-                        if (pthread_join(resolve->workers[i], NULL) != EINTR)
-                                break;
-                }
-        }
+        for (i = 0; i < resolve->n_valid_workers; i++)
+                pthread_join(resolve->workers[i], NULL);
 
         /* Close all communication channels */
         for (i = 0; i < _FD_MAX; i++)