diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-08 21:08:42 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-08 21:08:42 -0400 |
| commit | 9d4e7d1380927da67c25b57344f50ea1692aad96 (patch) | |
| tree | 20f9ac738da8992ea84f29bac5b7db3c19fd9b0b /src/libsystemd | |
| parent | 94edd38e1d2559f6685629eba71669ab24023c5d (diff) | |
sd-resolve: ignore error in pthread_join()
CID #1338424.
Diffstat (limited to 'src/libsystemd')
| -rw-r--r-- | src/libsystemd/sd-resolve/sd-resolve.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index 37585048b8..d8303e2e69 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c @@ -579,9 +579,10 @@ static void resolve_free(sd_resolve *resolve) { (void) send(resolve->fds[REQUEST_SEND_FD], &req, req.length, MSG_NOSIGNAL); } - /* Now terminate them and wait until they are gone. */ + /* Now terminate them and wait until they are gone. + If we get an error than most likely the thread already exited. */ for (i = 0; i < resolve->n_valid_workers; i++) - pthread_join(resolve->workers[i], NULL); + (void) pthread_join(resolve->workers[i], NULL); /* Close all communication channels */ for (i = 0; i < _FD_MAX; i++) |