Commit 9f6ce27e authored by Bruno Jesus's avatar Bruno Jesus Committed by Alexandre Julliard

ws2_32/tests: Avoid usage of inet_ntoa since its return is static.

parent 52c9dcb6
...@@ -4504,7 +4504,7 @@ static void test_AcceptEx(void) ...@@ -4504,7 +4504,7 @@ static void test_AcceptEx(void)
struct timeval timeout = {0,10}; /* wait for 10 milliseconds */ struct timeval timeout = {0,10}; /* wait for 10 milliseconds */
int got, conn1, i; int got, conn1, i;
DWORD bytesReturned, connect_time; DWORD bytesReturned, connect_time;
char buffer[1024]; char buffer[1024], ipbuffer[32];
OVERLAPPED overlapped; OVERLAPPED overlapped;
int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize;
BOOL bret; BOOL bret;
...@@ -4720,15 +4720,17 @@ static void test_AcceptEx(void) ...@@ -4720,15 +4720,17 @@ static void test_AcceptEx(void)
pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16,
(struct sockaddr **)&readBindAddress, &localSize, (struct sockaddr **)&readBindAddress, &localSize,
(struct sockaddr **)&readRemoteAddress, &remoteSize); (struct sockaddr **)&readRemoteAddress, &remoteSize);
strcpy( ipbuffer, inet_ntoa(readBindAddress->sin_addr));
ok( readBindAddress->sin_addr.s_addr == bindAddress.sin_addr.s_addr, ok( readBindAddress->sin_addr.s_addr == bindAddress.sin_addr.s_addr,
"Local socket address is different %s != %s\n", "Local socket address is different %s != %s\n",
inet_ntoa(readBindAddress->sin_addr), inet_ntoa(bindAddress.sin_addr)); ipbuffer, inet_ntoa(bindAddress.sin_addr));
ok( readBindAddress->sin_port == bindAddress.sin_port, ok( readBindAddress->sin_port == bindAddress.sin_port,
"Local socket port is different: %d != %d\n", "Local socket port is different: %d != %d\n",
readBindAddress->sin_port, bindAddress.sin_port); readBindAddress->sin_port, bindAddress.sin_port);
strcpy( ipbuffer, inet_ntoa(readRemoteAddress->sin_addr));
ok( readRemoteAddress->sin_addr.s_addr == peerAddress.sin_addr.s_addr, ok( readRemoteAddress->sin_addr.s_addr == peerAddress.sin_addr.s_addr,
"Remote socket address is different %s != %s\n", "Remote socket address is different %s != %s\n",
inet_ntoa(readRemoteAddress->sin_addr), inet_ntoa(peerAddress.sin_addr)); ipbuffer, inet_ntoa(peerAddress.sin_addr));
ok( readRemoteAddress->sin_port == peerAddress.sin_port, ok( readRemoteAddress->sin_port == peerAddress.sin_port,
"Remote socket port is different: %d != %d\n", "Remote socket port is different: %d != %d\n",
readRemoteAddress->sin_port, peerAddress.sin_port); readRemoteAddress->sin_port, peerAddress.sin_port);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment