commit 8549821b7fc2475c5895281b88363c44528a799d
author Francois Gouget <fgouget@free.fr> Thu Jan 10 18:18:43 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 10 18:18:43 2002 +0000
tree dbf74e3359898063a28e2fbc94e3046957747a1b
parent 13b0c0915b195288a60d31d037eba568b21ae065

Fix previous patch: the ws_sockaddr_u2ws return value was wrong.
Make ws_sockaddr_{ws2u,u2ws} static.

dlls/winsock/socket.c

diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 24a8485..f7ca20c 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -797,7 +797,7 @@
  * start with. Note that the returned pointer may be the original pointer 
  * if no conversion is necessary.
  */
-const struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, int *uaddrlen)
+static const struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, int *uaddrlen)
 {
     switch (wsaddr->sa_family)
     {
@@ -849,7 +849,7 @@
 }
 
 /* Returns 0 if successful, -1 if the buffer is too small */
-int ws_sockaddr_u2ws(const struct sockaddr* uaddr, int uaddrlen, struct WS_sockaddr* wsaddr, int* wsaddrlen)
+static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, int uaddrlen, struct WS_sockaddr* wsaddr, int* wsaddrlen)
 {
     int res;
 
@@ -866,6 +866,7 @@
             {
             default:
                 res=0; /* enough */
+                *wsaddrlen=uaddrlen;
                 wsipx->sa_socket=uipx->sipx_port;
                 /* fall through */
             case 13:
@@ -896,9 +897,13 @@
 
     default:
         /* No conversion needed */
-        *wsaddrlen = min(*wsaddrlen,uaddrlen);
         memcpy(wsaddr,uaddr,*wsaddrlen);
-        res=(*wsaddrlen<uaddrlen?-1:0);
+        if (*wsaddrlen<uaddrlen) {
+            res=-1;
+        } else {
+            *wsaddrlen=uaddrlen;
+            res=0;
+        }
     }
     return res;
 }