diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-04-11 11:19:27 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-04-11 11:19:27 +0200 |
| commit | 14b662590144571985897855f9973f16e386e0ce (patch) | |
| tree | 1bd53b773f592dc583aff4635537a10a6f89fcaa /src/libsystemd | |
| parent | cbe22206143a04f573e5cfbc8c839ddf2fd8c5dc (diff) | |
| parent | 7236ce6e9e379948217c31f38b48de6448521162 (diff) | |
Merge pull request #2996 from keszybz/coverity-fixes
Coverity fixes
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++) |