ws2_32: Replace switch statement with more suitable if statement.

35555862 · Andrew Talbot · Alexandre Julliard · 4bebe628 · 35555862
Commit 35555862 authored Oct 20, 2011 by Andrew Talbot Committed by Alexandre Julliard Oct 21, 2011
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

socket.c dlls/ws2_32/socket.c +10 -6

No files found.
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -5356,13 +5356,17 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol,
    }
    if ( af == AF_UNSPEC)  /* did they not specify the address family? */
-        switch(protocol)
    {
-          case IPPROTO_TCP:
+        if ((protocol == IPPROTO_TCP && type == SOCK_STREAM) ||
-             if (type == SOCK_STREAM) { af = AF_INET; break; }
+            (protocol == IPPROTO_UDP && type == SOCK_DGRAM))
-          case IPPROTO_UDP:
+        {
-             if (type == SOCK_DGRAM)  { af = AF_INET; break; }
+            af = AF_INET;
-          default: SetLastError(WSAEPROTOTYPE); return INVALID_SOCKET;
+        }
+        else
+        {
+            SetLastError(WSAEPROTOTYPE);
+            return INVALID_SOCKET;
+        }
    }
    SERVER_START_REQ( create_socket )