diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-09-19 00:12:01 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-09-19 00:12:01 +0000 |
commit | 75f799a3d885a5af42c5cb3af49da1299b8425cc (patch) | |
tree | 2121e5bf9f415b113b2df6527281e388958d89f1 /src/pulsecore/iochannel.c | |
parent | 0fcad977828665e46849cc4efe758ebc42450a66 (diff) |
make O_CLOEXEC, O_NONBLOCK and socket low latency fd ops more uniform: always return void, name them similarly, only pass a single fd
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1867 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/iochannel.c')
-rw-r--r-- | src/pulsecore/iochannel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c index 2f586cbf..90136fe6 100644 --- a/src/pulsecore/iochannel.c +++ b/src/pulsecore/iochannel.c @@ -145,17 +145,17 @@ pa_iochannel* pa_iochannel_new(pa_mainloop_api*m, int ifd, int ofd) { if (ifd == ofd) { pa_assert(ifd >= 0); - pa_make_nonblock_fd(io->ifd); + pa_make_fd_nonblock(io->ifd); io->input_event = io->output_event = m->io_new(m, ifd, PA_IO_EVENT_INPUT|PA_IO_EVENT_OUTPUT, callback, io); } else { if (ifd >= 0) { - pa_make_nonblock_fd(io->ifd); + pa_make_fd_nonblock(io->ifd); io->input_event = m->io_new(m, ifd, PA_IO_EVENT_INPUT, callback, io); } if (ofd >= 0) { - pa_make_nonblock_fd(io->ofd); + pa_make_fd_nonblock(io->ofd); io->output_event = m->io_new(m, ofd, PA_IO_EVENT_OUTPUT, callback, io); } } |