diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-07-27 09:18:28 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-07-27 09:18:28 +0000 |
| commit | 883861544a879eb161b1186ba6c62335a923aaca (patch) | |
| tree | 584390e992f4c81d9e91af44bf749f83c3d6d4c6 /winsup/cygwin/net.cc | |
| parent | 9869e006f3ac34d7bd67fb6327f3605725995abc (diff) | |
| download | cygnal-883861544a879eb161b1186ba6c62335a923aaca.tar.gz cygnal-883861544a879eb161b1186ba6c62335a923aaca.tar.bz2 cygnal-883861544a879eb161b1186ba6c62335a923aaca.zip | |
* fhandler_socket.cc (fhandler_socket::recvmsg): Remove unused tot
argument. All callers changed.
(fhandler_socket::sendmsg): Likewise.
* net.cc (cygwin_recvmsg): Likewise.
(cygwin_sendmsg): Likewise, and prevent calling sendmsg whith an
invalid iovec.
* fhandler.h (fhandler_socket::recvmsg): Adjust prototype.
(fhandler_socket::sendmsg): Likewise.
Diffstat (limited to 'winsup/cygwin/net.cc')
| -rw-r--r-- | winsup/cygwin/net.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 87a413556..5b8b78380 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -2071,7 +2071,7 @@ cygwin_recvmsg (int fd, struct msghdr *msg, int flags) { res = check_iovec_for_read (msg->msg_iov, msg->msg_iovlen); if (res > 0) - res = fh->recvmsg (msg, flags, res); // res == iovec tot + res = fh->recvmsg (msg, flags); } syscall_printf ("%d = recvmsg (%d, %p, %x)", res, fd, msg, flags); @@ -2093,7 +2093,8 @@ cygwin_sendmsg (int fd, const struct msghdr *msg, int flags) else { res = check_iovec_for_write (msg->msg_iov, msg->msg_iovlen); - res = fh->sendmsg (msg, flags, res); // res == iovec tot + if (res >= 0) + res = fh->sendmsg (msg, flags); } syscall_printf ("%d = sendmsg (%d, %p, %x)", res, fd, msg, flags); |