diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-06-10 21:47:24 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-06-10 21:47:24 +0000 |
| commit | b4177338e194ad5fae4241eab9c85b9ae6554d6b (patch) | |
| tree | b231c8d8a07d051339f2f39b8b6a81e9735b33f7 /winsup/cygwin | |
| parent | 6700d99e7e5603600ec6290e581577ac933e1f5b (diff) | |
| download | cygnal-b4177338e194ad5fae4241eab9c85b9ae6554d6b.tar.gz cygnal-b4177338e194ad5fae4241eab9c85b9ae6554d6b.tar.bz2 cygnal-b4177338e194ad5fae4241eab9c85b9ae6554d6b.zip | |
* fhandler_socket.cc (fhandler_socket::sendto): Always initialize
ret to 0.
(fhandler_socket::sendmsg): Ditto.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | 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,5 +1,11 @@ 2005-06-10 Corinna Vinschen <corinna@vinschen.de> + * fhandler_socket.cc (fhandler_socket::sendto): Always initialize + ret to 0. + (fhandler_socket::sendmsg): Ditto. + +2005-06-10 Corinna Vinschen <corinna@vinschen.de> + * cygwin.din (imaxabs): Export. (imaxdiv): Export. (llabs): 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 |