diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-09 21:56:49 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-09 21:56:49 +0100 |
| commit | b0bc8dbd73b7d1f66f01849d89acca59c9fbc699 (patch) | |
| tree | cf4ce91cd4a2c4dcf325ee210aa507b4dc5e78bb /src/libsystemd | |
| parent | 70d54fca18f52e20c07f37a6c86133229521ee47 (diff) | |
| parent | e1427b138fbf7b7f13bb61187635b882be3ca2b2 (diff) | |
Merge pull request #1820 from michich/errno-v2
[v2] treewide: treatment of errno and other cleanups
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-resolve/sd-resolve.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index 48767600c9..34a0b03f92 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++) |