diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-10-30 03:32:38 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-10-30 03:32:38 +0100 |
commit | 65e7bc18a9a7b89e55b87a74ae47d45269b51847 (patch) | |
tree | b9f58d76a78ecc0c03557bf7a7dad14cf28e15f9 /src/pulsecore/fdsem.c | |
parent | 9c1a98953f25aff7f11af80a073c9c46dee2438c (diff) |
use cloexec wrappers wherever applicable
Diffstat (limited to 'src/pulsecore/fdsem.c')
-rw-r--r-- | src/pulsecore/fdsem.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/pulsecore/fdsem.c b/src/pulsecore/fdsem.c index 380f34f5..ea14e8a7 100644 --- a/src/pulsecore/fdsem.c +++ b/src/pulsecore/fdsem.c @@ -62,19 +62,15 @@ pa_fdsem *pa_fdsem_new(void) { f = pa_xmalloc(PA_ALIGN(sizeof(pa_fdsem)) + PA_ALIGN(sizeof(pa_fdsem_data))); #ifdef HAVE_SYS_EVENTFD_H - if ((f->efd = eventfd(0, 0)) >= 0) { - pa_make_fd_cloexec(f->efd); + if ((f->efd = eventfd(0, EFD_CLOEXEC)) >= 0) f->fds[0] = f->fds[1] = -1; - } else + else #endif { - if (pipe(f->fds) < 0) { + if (pa_pipe_cloexec(f->fds) < 0) { pa_xfree(f); return NULL; } - - pa_make_fd_cloexec(f->fds[0]); - pa_make_fd_cloexec(f->fds[1]); } f->data = (pa_fdsem_data*) ((uint8_t*) f + PA_ALIGN(sizeof(pa_fdsem))); @@ -114,12 +110,11 @@ pa_fdsem *pa_fdsem_new_shm(pa_fdsem_data *data, int* event_fd) { f = pa_xnew(pa_fdsem, 1); - if ((f->efd = eventfd(0, 0)) < 0) { + if ((f->efd = eventfd(0, EFD_CLOEXEC)) < 0) { pa_xfree(f); return NULL; } - pa_make_fd_cloexec(f->efd); f->fds[0] = f->fds[1] = -1; f->data = data; |