Alexandre Julliard : ws2_32: Use socklen_t where appropriate.

Alexandre Julliard julliard at winehq.org
Fri Jun 16 18:15:09 CDT 2017


Module: wine
Branch: master
Commit: 92b2172038ed23830a399d18b7523dc37fda1e92
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=92b2172038ed23830a399d18b7523dc37fda1e92

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jun 16 13:52:38 2017 +0200

ws2_32: Use socklen_t where appropriate.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ws2_32/socket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 7a768ac..f212ec2 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3053,7 +3053,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD
                                      DWORD flags )
 {
     union generic_unix_sockaddr uaddr;
-    unsigned int uaddrlen = sizeof(uaddr);
+    socklen_t uaddrlen = sizeof(uaddr);
     struct ws2_transmitfile_async *wsa;
     NTSTATUS status;
     int fd;
@@ -7720,8 +7720,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
     {
         /* It's invalid to receive OOB data from an OOBINLINED socket
          * as OOB data is turned into normal data. */
-        i = sizeof(n);
-        if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &i) && n)
+        socklen_t len = sizeof(n);
+        if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &len) && n)
         {
             err = WSAEINVAL;
             goto error;




More information about the wine-cvs mailing list