From b4177338e194ad5fae4241eab9c85b9ae6554d6b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 10 Jun 2005 21:47:24 +0000 Subject: [PATCH] * fhandler_socket.cc (fhandler_socket::sendto): Always initialize ret to 0. (fhandler_socket::sendmsg): Ditto. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/fhandler_socket.cc | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6f1d16a4f..a9047b0ec 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2005-06-10 Corinna Vinschen + + * fhandler_socket.cc (fhandler_socket::sendto): Always initialize + ret to 0. + (fhandler_socket::sendmsg): Ditto. + 2005-06-10 Corinna Vinschen * cygwin.din (imaxabs): Export. diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 8fd952163..31800e49c 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1201,7 +1201,7 @@ fhandler_socket::sendto (const void *ptr, size_t len, int flags, return SOCKET_ERROR; int res = SOCKET_ERROR; - DWORD ret; + DWORD ret = 0; if (!winsock2_active) ret = res = ::sendto (get_socket (), (const char *) ptr, len, @@ -1212,7 +1212,7 @@ fhandler_socket::sendto (const void *ptr, size_t len, int flags, WSABUF wsabuf = { len, (char *) ptr }; if (is_nonblocking () || closed () || async_io ()) - res = WSASendTo (get_socket (), &wsabuf, 1, (ret = 0, &ret), + res = WSASendTo (get_socket (), &wsabuf, 1, &ret, flags & MSG_WINMASK, (to ? (const struct sockaddr *) &sin : NULL), tolen, NULL, NULL); @@ -1340,10 +1340,10 @@ fhandler_socket::sendmsg (const struct msghdr *msg, int flags, ssize_t tot) while (wsaptr != wsabuf); } - DWORD ret; + DWORD ret = 0; if (is_nonblocking () || closed () || async_io ()) - res = WSASendTo (get_socket (), wsabuf, iovcnt, (ret = 0, &ret), + res = WSASendTo (get_socket (), wsabuf, iovcnt, &ret, flags, (struct sockaddr *) msg->msg_name, msg->msg_namelen, NULL, NULL); else