diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-21 13:59:38 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-21 13:59:38 +0200 |
| commit | ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27 (patch) | |
| tree | debba7630c16dc9580d294f355683ec42f398ffd /pflocal/socket.c | |
| parent | 59f09db0b59c710e65aa075874f9d53f29ee18cf (diff) | |
| download | hurd-ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27.tar.gz hurd-ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27.tar.bz2 hurd-ac5d97ead2173f6ec6a8fc3f57b994c86c0afe27.zip | |
Rename SOCK_* into PFLOCAL_SOCK_*
To avoid conflicting with glibc's SOCK_*
* pflocal/io.c, pflocal/sock.c, pflocal/sock.h, pflocal/socket.c: Rename
SOCK_CONNECTED into PFLOCAL_SOCK_CONNECTED,
SOCK_NONBLOCK into PFLOCAL_SOCK_NONBLOCK,
SOCK_SHUTDOWN_READ into PFLOCAL_SOCK_SHUTDOWN_READ,
SOCK_SHUTDOWN_WRITE into PFLOCAL_SOCK_SHUTDOWN_WRITE.
Diffstat (limited to 'pflocal/socket.c')
| -rw-r--r-- | pflocal/socket.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pflocal/socket.c b/pflocal/socket.c index ce1edd82..6723734c 100644 --- a/pflocal/socket.c +++ b/pflocal/socket.c @@ -109,8 +109,8 @@ S_socket_connect (struct sock_user *user, struct addr *addr) if (sock->connect_queue) /* SOCK is already doing a connect. */ err = EALREADY; - else if (sock->flags & SOCK_CONNECTED) - /* SOCK_CONNECTED is only set for connection-oriented sockets, + else if (sock->flags & PFLOCAL_SOCK_CONNECTED) + /* PFLOCAL_SOCK_CONNECTED is only set for connection-oriented sockets, which can only ever connect once. [If we didn't do this test here, it would eventually fail when the listening socket tried to accept our connection request.] */ @@ -124,7 +124,7 @@ S_socket_connect (struct sock_user *user, struct addr *addr) pthread_mutex_unlock (&sock->lock); err = connq_connect (peer->listen_queue, - sock->flags & SOCK_NONBLOCK); + sock->flags & PFLOCAL_SOCK_NONBLOCK); if (!err) { struct sock *server; @@ -182,7 +182,7 @@ S_socket_accept (struct sock_user *user, struct sock *peer_sock; err = connq_listen (sock->listen_queue, - (sock->flags & SOCK_NONBLOCK) ? &noblock : NULL, + (sock->flags & PFLOCAL_SOCK_NONBLOCK) ? &noblock : NULL, &peer_sock); if (!err) { @@ -229,8 +229,8 @@ S_socket_shutdown (struct sock_user *user, int what) if (! user) return EOPNOTSUPP; sock_shutdown (user->sock, - (what != 1 ? SOCK_SHUTDOWN_READ : 0) - | (what != 0 ? SOCK_SHUTDOWN_WRITE : 0)); + (what != 1 ? PFLOCAL_SOCK_SHUTDOWN_READ : 0) + | (what != 0 ? PFLOCAL_SOCK_SHUTDOWN_WRITE : 0)); return 0; } @@ -325,7 +325,7 @@ S_socket_send (struct sock_user *user, struct addr *dest_addr, int flags, if (!err) { - err = pipe_send (pipe, sock->flags & SOCK_NONBLOCK, + err = pipe_send (pipe, sock->flags & PFLOCAL_SOCK_NONBLOCK, source_addr, data, data_len, control, control_len, ports, num_ports, amount); @@ -391,7 +391,7 @@ S_socket_recv (struct sock_user *user, else if (!err) { err = - pipe_recv (pipe, user->sock->flags & SOCK_NONBLOCK, &flags, + pipe_recv (pipe, user->sock->flags & PFLOCAL_SOCK_NONBLOCK, &flags, &source_addr, data, data_len, amount, control, control_len, ports, num_ports); pipe_release_reader (pipe); |