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/socket-client.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/socket-client.c')
| -rw-r--r-- | src/pulsecore/socket-client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c index 360a0b48..6748c285 100644 --- a/src/pulsecore/socket-client.c +++ b/src/pulsecore/socket-client.c @@ -208,7 +208,7 @@ static int do_connect(pa_socket_client *c, const struct sockaddr *sa, socklen_t pa_assert(sa); pa_assert(len > 0); - pa_make_nonblock_fd(c->fd); + pa_make_fd_nonblock(c->fd); if ((r = connect(c->fd, sa, len)) < 0) { #ifdef OS_IS_WIN32 @@ -293,11 +293,11 @@ static int sockaddr_prepare(pa_socket_client *c, const struct sockaddr *sa, size return -1; } - pa_fd_set_cloexec(c->fd, 1); + pa_make_fd_cloexec(c->fd); if (sa->sa_family == AF_INET || sa->sa_family == AF_INET6) - pa_socket_tcp_low_delay(c->fd); + pa_make_tcp_socket_low_delay(c->fd); else - pa_socket_low_delay(c->fd); + pa_make_socket_low_delay(c->fd); if (do_connect(c, sa, salen) < 0) return -1; |