summaryrefslogtreecommitdiffstats
path: root/src/modules
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/modules
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/modules')
-rw-r--r--src/modules/module-pipe-sink.c4
-rw-r--r--src/modules/module-pipe-source.c4
-rw-r--r--src/modules/oss-util.c2
-rw-r--r--src/modules/rtp/module-rtp-send.c6
4 files changed, 9 insertions, 7 deletions
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index a1bdc8fb..edacf04b 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -236,8 +236,8 @@ int pa__init(pa_module*m) {
goto fail;
}
- pa_fd_set_cloexec(u->fd, 1);
- pa_make_nonblock_fd(u->fd);
+ pa_make_fd_cloexec(u->fd);
+ pa_make_fd_nonblock(u->fd);
if (fstat(u->fd, &st) < 0) {
pa_log("fstat('%s'): %s", u->filename, pa_cstrerror(errno));
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index 382da8f9..2313df67 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -214,8 +214,8 @@ int pa__init(pa_module*m) {
goto fail;
}
- pa_fd_set_cloexec(u->fd, 1);
- pa_make_nonblock_fd(u->fd);
+ pa_make_fd_cloexec(u->fd);
+ pa_make_fd_nonblock(u->fd);
if (fstat(u->fd, &st) < 0) {
pa_log("fstat('%s'): %s",u->filename, pa_cstrerror(errno));
diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index 36498809..3bef8a39 100644
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -141,7 +141,7 @@ success:
#endif
*pcaps & DSP_CAP_TRIGGER ? " TRIGGER" : "");
- pa_fd_set_cloexec(fd, 1);
+ pa_make_fd_cloexec(fd);
return fd;
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 8fac44f0..f79867c2 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -280,8 +280,10 @@ int pa__init(pa_module*m) {
}
/* If the socket queue is full, let's drop packets */
- pa_make_nonblock_fd(fd);
- pa_socket_udp_low_delay(fd);
+ pa_make_fd_nonblock(fd);
+ pa_make_udp_socket_low_delay(fd);
+ pa_make_fd_cloexec(fd);
+ pa_make_fd_cloexec(sap_fd);
pa_source_output_new_data_init(&data);
data.name = "RTP Monitor Stream";