ws2_32: Better trace __WSAFDIsSet

Bruno Jesus 00cpxxx at gmail.com
Fri Jan 2 10:07:15 CST 2015


Example:

trace:winsock:__WSAFDIsSet (socket: 01a4, fd_set 0x32e458, count 0) <-- 0
trace:winsock:__WSAFDIsSet (socket: 01a4, fd_set 0x32e354, count 1) <-- 1
trace:winsock:__WSAFDIsSet (socket: 01a4, fd_set 0x32e55c, count 0) <-- 0


Instead of:

trace:winsock:__WSAFDIsSet (420,0x32e438(0))
trace:winsock:__WSAFDIsSet (420,0x32e334(1))
trace:winsock:__WSAFDIsSet (420,0x32e53c(0))
-------------- next part --------------
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index b6aad67..7e73098 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -6359,13 +6359,19 @@ SOCKET WINAPI WSAJoinLeaf(
  */
 int WINAPI __WSAFDIsSet(SOCKET s, WS_fd_set *set)
 {
-  int i = set->fd_count;
+  int i = set->fd_count, ret = 0;
 
-  TRACE("(%ld,%p(%i))\n", s, set, i);
+  TRACE("(socket %04lx, fd_set %p, count %i)", s, set, i);
 
   while (i--)
-      if (set->fd_array[i] == s) return 1;
-  return 0;
+      if (set->fd_array[i] == s)
+      {
+          ret = 1;
+          break;
+      };
+
+  TRACE(" <-- %d\n", ret);
+  return ret;
 }
 
 /***********************************************************************


More information about the wine-patches mailing list