From ef5d6645960b1ad8b1af244be5d32b3b0d65201d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 17 Oct 1999 22:43:33 +0000 Subject: Update. 1999-10-17 Ulrich Drepper * elf/elf.h: Add various platform and architecture extensions. * locale/lc-collate.c (_nl_postload_collate): Disable code for now. * locale/setlocale.c (setlocale): Don't call _nl_find_locale for LC_ALL. * socket/sys/socket.h: Remove K&R compatibility. 1999-10-16 Andreas Jaeger * sysdeps/unix/sysv/linux/bits/in.h: Added struct in_pktinfo. 1999-10-15 Andreas Jaeger * stdlib/Makefile (tests): Added tst-xpg-basename. * stdlib/tst-xpg-basename.c: New test file. --- socket/sys/socket.h | 71 ++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 34 deletions(-) (limited to 'socket/sys') diff --git a/socket/sys/socket.h b/socket/sys/socket.h index 0a5dc01901..dbb6dabd2c 100644 --- a/socket/sys/socket.h +++ b/socket/sys/socket.h @@ -96,96 +96,99 @@ typedef union { __SOCKADDR_ALLTYPES /* Create a new socket of type TYPE in domain DOMAIN, using protocol PROTOCOL. If PROTOCOL is zero, one is chosen automatically. Returns a file descriptor for the new socket, or -1 for errors. */ -extern int socket __P ((int __domain, int __type, int __protocol)); +extern int socket (int __domain, int __type, int __protocol) __THROW; /* Create two new sockets, of type TYPE in domain DOMAIN and using protocol PROTOCOL, which are connected to each other, and put file descriptors for them in FDS[0] and FDS[1]. If PROTOCOL is zero, one will be chosen automatically. Returns 0 on success, -1 for errors. */ -extern int socketpair __P ((int __domain, int __type, int __protocol, - int __fds[2])); +extern int socketpair (int __domain, int __type, int __protocol, + int __fds[2]) __THROW; /* Give the socket FD the local address ADDR (which is LEN bytes long). */ -extern int bind __P ((int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len)); +extern int bind (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) + __THROW; /* Put the local address of FD into *ADDR and its length in *LEN. */ -extern int getsockname __P ((int __fd, __SOCKADDR_ARG __addr, - socklen_t *__len)); +extern int getsockname (int __fd, __SOCKADDR_ARG __addr, socklen_t *__len) + __THROW; /* Open a connection on socket FD to peer at ADDR (which LEN bytes long). For connectionless socket types, just set the default address to send to and the only address from which to accept transmissions. Return 0 on success, -1 for errors. */ -extern int __connect __P ((int __fd, - __CONST_SOCKADDR_ARG __addr, socklen_t __len)); -extern int connect __P ((int __fd, - __CONST_SOCKADDR_ARG __addr, socklen_t __len)); +extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) + __THROW; +extern int connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) + __THROW; /* Put the address of the peer connected to socket FD into *ADDR (which is *LEN bytes long), and its actual length into *LEN. */ -extern int getpeername __P ((int __fd, __SOCKADDR_ARG __addr, - socklen_t *__len)); +extern int getpeername (int __fd, __SOCKADDR_ARG __addr, socklen_t *__len) + __THROW; /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ -extern int __send __P ((int __fd, __const __ptr_t __buf, size_t __n, - int __flags)); -extern int send __P ((int __fd, __const __ptr_t __buf, size_t __n, - int __flags)); +extern int __send (int __fd, __const void *__buf, size_t __n, int __flags) + __THROW; +extern int send (int __fd, __const void *__buf, size_t __n, int __flags) + __THROW; /* Read N bytes into BUF from socket FD. Returns the number read or -1 for errors. */ -extern int recv __P ((int __fd, __ptr_t __buf, size_t __n, int __flags)); +extern int recv (int __fd, void *__buf, size_t __n, int __flags) + __THROW; /* Send N bytes of BUF on socket FD to peer at address ADDR (which is ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */ -extern int sendto __P ((int __fd, __const __ptr_t __buf, size_t __n, - int __flags, __CONST_SOCKADDR_ARG __addr, - socklen_t __addr_len)); +extern int sendto (int __fd, __const void *__buf, size_t __n, + int __flags, __CONST_SOCKADDR_ARG __addr, + socklen_t __addr_len) __THROW; /* Read N bytes into BUF through socket FD. If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of the sender, and store the actual size of the address in *ADDR_LEN. Returns the number of bytes read or -1 for errors. */ -extern int recvfrom __P ((int __fd, __ptr_t __buf, size_t __n, int __flags, - __SOCKADDR_ARG __addr, socklen_t *__addr_len)); +extern int recvfrom (int __fd, void *__buf, size_t __n, int __flags, + __SOCKADDR_ARG __addr, socklen_t *__addr_len) __THROW; /* Send a message described MESSAGE on socket FD. Returns the number of bytes sent, or -1 for errors. */ -extern int sendmsg __P ((int __fd, __const struct msghdr *__message, - int __flags)); +extern int sendmsg (int __fd, __const struct msghdr *__message, int __flags) + __THROW; /* Receive a message as described by MESSAGE from socket FD. Returns the number of bytes read or -1 for errors. */ -extern int recvmsg __P ((int __fd, struct msghdr *__message, int __flags)); +extern int recvmsg (int __fd, struct msghdr *__message, int __flags) + __THROW; /* Put the current value for socket FD's option OPTNAME at protocol level LEVEL into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's actual length. Returns 0 on success, -1 for errors. */ -extern int getsockopt __P ((int __fd, int __level, int __optname, - __ptr_t __optval, socklen_t *__optlen)); +extern int getsockopt (int __fd, int __level, int __optname, + void *__optval, socklen_t *__optlen) __THROW; /* Set socket FD's option OPTNAME at protocol level LEVEL to *OPTVAL (which is OPTLEN bytes long). Returns 0 on success, -1 for errors. */ -extern int setsockopt __P ((int __fd, int __level, int __optname, - __const __ptr_t __optval, socklen_t __optlen)); +extern int setsockopt (int __fd, int __level, int __optname, + __const void *__optval, socklen_t __optlen) __THROW; /* Prepare to accept connections on socket FD. N connection requests will be queued before further requests are refused. Returns 0 on success, -1 for errors. */ -extern int listen __P ((int __fd, unsigned int __n)); +extern int listen (int __fd, unsigned int __n) __THROW; /* Await a connection on socket FD. When a connection arrives, open a new socket to communicate with it, set *ADDR (which is *ADDR_LEN bytes long) to the address of the connecting peer and *ADDR_LEN to the address's actual length, and return the new socket's descriptor, or -1 for errors. */ -extern int accept __P ((int __fd, __SOCKADDR_ARG __addr, - socklen_t *__addr_len)); +extern int accept (int __fd, __SOCKADDR_ARG __addr, socklen_t *__addr_len) + __THROW; /* Shut down all or part of the connection open on socket FD. HOW determines what to shut down: @@ -193,13 +196,13 @@ extern int accept __P ((int __fd, __SOCKADDR_ARG __addr, SHUT_WR = No more transmissions; SHUT_RDWR = No more receptions or transmissions. Returns 0 on success, -1 for errors. */ -extern int shutdown __P ((int __fd, int __how)); +extern int shutdown (int __fd, int __how) __THROW; /* FDTYPE is S_IFSOCK or another S_IF* macro defined in ; returns 1 if FD is open on an object of the indicated type, 0 if not, or -1 for errors (setting errno). */ -extern int isfdtype __P ((int __fd, int __fdtype)); +extern int isfdtype (int __fd, int __fdtype) __THROW; __END_DECLS -- cgit v1.2.3