summaryrefslogtreecommitdiffstats
path: root/src/pulse
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-19 00:12:01 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-19 00:12:01 +0000
commit75f799a3d885a5af42c5cb3af49da1299b8425cc (patch)
tree2121e5bf9f415b113b2df6527281e388958d89f1 /src/pulse
parent0fcad977828665e46849cc4efe758ebc42450a66 (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/pulse')
-rw-r--r--src/pulse/context.c6
-rw-r--r--src/pulse/mainloop-signal.c8
-rw-r--r--src/pulse/mainloop.c8
3 files changed, 11 insertions, 11 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c
index a39646d3..805cd44e 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -498,10 +498,10 @@ static int context_connect_spawn(pa_context *c) {
goto fail;
}
- pa_fd_set_cloexec(fds[0], 1);
+ pa_make_fd_cloexec(fds[0]);
- pa_socket_low_delay(fds[0]);
- pa_socket_low_delay(fds[1]);
+ pa_make_socket_low_delay(fds[0]);
+ pa_make_socket_low_delay(fds[1]);
if (c->spawn_api.prefork)
c->spawn_api.prefork();
diff --git a/src/pulse/mainloop-signal.c b/src/pulse/mainloop-signal.c
index b6414c4e..a986b241 100644
--- a/src/pulse/mainloop-signal.c
+++ b/src/pulse/mainloop-signal.c
@@ -123,10 +123,10 @@ int pa_signal_init(pa_mainloop_api *a) {
return -1;
}
- pa_make_nonblock_fd(signal_pipe[0]);
- pa_make_nonblock_fd(signal_pipe[1]);
- pa_assert_se(pa_fd_set_cloexec(signal_pipe[0], 1) == 0);
- pa_assert_se(pa_fd_set_cloexec(signal_pipe[1], 1) == 0);
+ pa_make_fd_nonblock(signal_pipe[0]);
+ pa_make_fd_nonblock(signal_pipe[1]);
+ pa_make_fd_cloexec(signal_pipe[0]);
+ pa_make_fd_cloexec(signal_pipe[1]);
api = a;
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index c69c6653..bab8eb5c 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -457,10 +457,10 @@ pa_mainloop *pa_mainloop_new(void) {
return NULL;
}
- pa_make_nonblock_fd(m->wakeup_pipe[0]);
- pa_make_nonblock_fd(m->wakeup_pipe[1]);
- pa_fd_set_cloexec(m->wakeup_pipe[0], 1);
- pa_fd_set_cloexec(m->wakeup_pipe[1], 1);
+ pa_make_fd_nonblock(m->wakeup_pipe[0]);
+ pa_make_fd_nonblock(m->wakeup_pipe[1]);
+ pa_make_fd_cloexec(m->wakeup_pipe[0]);
+ pa_make_fd_cloexec(m->wakeup_pipe[1]);
m->wakeup_requested = 0;
PA_LLIST_HEAD_INIT(pa_io_event, m->io_events);