From c2063191c35b57831414ed9a48e549ba3d2d2321 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 24 Apr 2001 13:36:50 +0000 Subject: send returns ssize_t. --- include/sys/socket.h | 2 +- linuxthreads/wrapsyscall.c | 24 ++++++++++++------------ socket/sys/socket.h | 18 +++++++++--------- sysdeps/generic/recvfrom.c | 4 ++-- sysdeps/generic/recvmsg.c | 4 ++-- sysdeps/generic/send.c | 4 ++-- sysdeps/generic/sendmsg.c | 4 ++-- sysdeps/generic/sendto.c | 4 ++-- sysdeps/mach/hurd/recv.c | 4 ++-- sysdeps/mach/hurd/recvfrom.c | 4 ++-- sysdeps/mach/hurd/send.c | 4 ++-- sysdeps/mach/hurd/sendto.c | 4 ++-- 12 files changed, 40 insertions(+), 40 deletions(-) diff --git a/include/sys/socket.h b/include/sys/socket.h index 5e97ddfb53..4ae7108509 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -20,7 +20,7 @@ extern int __opensock (void) internal_function; extern int __getpeername (int __fd, __SOCKADDR_ARG __addr, socklen_t *__len); /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ -extern int __send (int __fd, __const void *__buf, size_t __n, int __flags); +extern ssize_t __send (int __fd, __const void *__buf, size_t __n, int __flags); /* 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 diff --git a/linuxthreads/wrapsyscall.c b/linuxthreads/wrapsyscall.c index 5563eb0e67..74923e14e4 100644 --- a/linuxthreads/wrapsyscall.c +++ b/linuxthreads/wrapsyscall.c @@ -1,5 +1,5 @@ /* Wrapper arpund system calls to provide cancelation points. - Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -195,31 +195,31 @@ CANCELABLE_SYSCALL (int, connect, (int fd, __CONST_SOCKADDR_ARG addr, strong_alias (connect, __connect) /* recv(2). */ -CANCELABLE_SYSCALL (int, recv, (int fd, __ptr_t buf, size_t n, int flags), +CANCELABLE_SYSCALL (ssize_t, recv, (int fd, __ptr_t buf, size_t n, int flags), (fd, buf, n, flags)) /* recvfrom(2). */ -CANCELABLE_SYSCALL (int, recvfrom, (int fd, __ptr_t buf, size_t n, int flags, - __SOCKADDR_ARG addr, socklen_t *addr_len), +CANCELABLE_SYSCALL (ssize_t, recvfrom, (int fd, __ptr_t buf, size_t n, int flags, + __SOCKADDR_ARG addr, socklen_t *addr_len), (fd, buf, n, flags, addr, addr_len)) /* recvmsg(2). */ -CANCELABLE_SYSCALL (int, recvmsg, (int fd, struct msghdr *message, int flags), +CANCELABLE_SYSCALL (ssize_t, recvmsg, (int fd, struct msghdr *message, int flags), (fd, message, flags)) /* send(2). */ -CANCELABLE_SYSCALL (int, send, (int fd, const __ptr_t buf, size_t n, - int flags), +CANCELABLE_SYSCALL (ssize_t, send, (ssize_t fd, const __ptr_t buf, size_t n, + int flags), (fd, buf, n, flags)) strong_alias (send, __send) /* sendmsg(2). */ -CANCELABLE_SYSCALL (int, sendmsg, (int fd, const struct msghdr *message, - int flags), +CANCELABLE_SYSCALL (ssize_t, sendmsg, (int fd, const struct msghdr *message, + int flags), (fd, message, flags)) /* sendto(2). */ -CANCELABLE_SYSCALL (int, sendto, (int fd, const __ptr_t buf, size_t n, - int flags, __CONST_SOCKADDR_ARG addr, - socklen_t addr_len), +CANCELABLE_SYSCALL (ssize_t, sendto, (ssize_t fd, const __ptr_t buf, size_t n, + int flags, __CONST_SOCKADDR_ARG addr, + socklen_t addr_len), (fd, buf, n, flags, addr, addr_len)) diff --git a/socket/sys/socket.h b/socket/sys/socket.h index 83f7de7331..7ccb7dd8d0 100644 --- a/socket/sys/socket.h +++ b/socket/sys/socket.h @@ -128,37 +128,37 @@ extern int getpeername (int __fd, __SOCKADDR_ARG __addr, /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ -extern int send (int __fd, __const void *__buf, size_t __n, int __flags) +extern ssize_t 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 (int __fd, void *__buf, size_t __n, int __flags) +extern ssize_t 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 (int __fd, __const void *__buf, size_t __n, - int __flags, __CONST_SOCKADDR_ARG __addr, - socklen_t __addr_len) __THROW; +extern ssize_t 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 (int __fd, void *__restrict __buf, size_t __n, int __flags, - __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) +extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, int __flags, + __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) __THROW; /* Send a message described MESSAGE on socket FD. Returns the number of bytes sent, or -1 for errors. */ -extern int sendmsg (int __fd, __const struct msghdr *__message, int __flags) +extern ssize_t 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 (int __fd, struct msghdr *__message, int __flags) +extern ssize_t recvmsg (int __fd, struct msghdr *__message, int __flags) __THROW; diff --git a/sysdeps/generic/recvfrom.c b/sysdeps/generic/recvfrom.c index 35b281a2a1..acb1e98ef1 100644 --- a/sysdeps/generic/recvfrom.c +++ b/sysdeps/generic/recvfrom.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ /* Read N bytes into BUF through socket FD from peer at address ADDR (which is ADDR_LEN bytes long). Returns the number read or -1 for errors. */ -int +ssize_t recvfrom (fd, buf, n, flags, addr, addr_len) int fd; void *buf; diff --git a/sysdeps/generic/recvmsg.c b/sysdeps/generic/recvmsg.c index 625e85aae9..c4bbd1b2ce 100644 --- a/sysdeps/generic/recvmsg.c +++ b/sysdeps/generic/recvmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ /* Receive a message as described by MESSAGE from socket FD. Returns the number of bytes read or -1 for errors. */ -int +ssize_t recvmsg (fd, message, flags) int fd; struct msghdr *message; diff --git a/sysdeps/generic/send.c b/sysdeps/generic/send.c index 0ef82948ea..35c05baaea 100644 --- a/sysdeps/generic/send.c +++ b/sysdeps/generic/send.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ -int +ssize_t __send (fd, buf, n, flags) int fd; __const __ptr_t buf; diff --git a/sysdeps/generic/sendmsg.c b/sysdeps/generic/sendmsg.c index 20d8bd6f67..9f771be635 100644 --- a/sysdeps/generic/sendmsg.c +++ b/sysdeps/generic/sendmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ /* Send a message described MESSAGE on socket FD. Returns the number of bytes sent, or -1 for errors. */ -int +ssize_t sendmsg (fd, message, flags) int fd; const struct msghdr *message; diff --git a/sysdeps/generic/sendto.c b/sysdeps/generic/sendto.c index f9b3c87f68..54f3e18396 100644 --- a/sysdeps/generic/sendto.c +++ b/sysdeps/generic/sendto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ /* 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. */ -int +ssize_t sendto (fd, buf, n, flags, addr, addr_len) int fd; __const __ptr_t buf; diff --git a/sysdeps/mach/hurd/recv.c b/sysdeps/mach/hurd/recv.c index 6ae3a6ad8b..0e4ff034c1 100644 --- a/sysdeps/mach/hurd/recv.c +++ b/sysdeps/mach/hurd/recv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ Returns the number read or -1 for errors. */ /* XXX should be __recv ? */ -int +ssize_t recv (fd, buf, n, flags) int fd; void *buf; diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c index b39528628c..91417f88f4 100644 --- a/sysdeps/mach/hurd/recvfrom.c +++ b/sysdeps/mach/hurd/recvfrom.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1997, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -27,7 +27,7 @@ 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. */ -int +ssize_t recvfrom (fd, buf, n, flags, addrarg, addr_len) int fd; void *buf; diff --git a/sysdeps/mach/hurd/send.c b/sysdeps/mach/hurd/send.c index 73c53894b4..4899bef137 100644 --- a/sysdeps/mach/hurd/send.c +++ b/sysdeps/mach/hurd/send.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1996, 1997, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ #include /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ -int +ssize_t __send (fd, buf, n, flags) int fd; const void *buf; diff --git a/sysdeps/mach/hurd/sendto.c b/sysdeps/mach/hurd/sendto.c index 4f0ada7141..6f410683a6 100644 --- a/sysdeps/mach/hurd/sendto.c +++ b/sysdeps/mach/hurd/sendto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1995, 1996, 1997, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ /* 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. */ -int +ssize_t sendto (int fd, const void *buf, size_t n, -- cgit 1.4.1