---------------------
PatchSet 8149 
Date: 2006/06/04 14:12:15
Author: serassio
Branch: nt
Tag: (none) 
Log:
Use __WSAFDIsSet instead of FD_ISSET

Members: 
	src/comm_select_win32.c:1.1.2.8->1.1.2.9 

Index: squid/src/comm_select_win32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm_select_win32.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- squid/src/comm_select_win32.c	2 Jun 2006 13:05:19 -0000	1.1.2.8
+++ squid/src/comm_select_win32.c	4 Jun 2006 14:12:15 -0000	1.1.2.9
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_select_win32.c,v 1.1.2.8 2006/06/02 13:05:19 serassio Exp $
+ * $Id: comm_select_win32.c,v 1.1.2.9 2006/06/04 14:12:15 serassio Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -211,7 +211,7 @@
 	return incoming_sockets_accepted;
     for (i = 0; i < nfds; i++) {
 	fd = fds[i];
-	if (FD_ISSET(fd, &read_mask)) {
+	if (__WSAFDIsSet(fd_table[fd].win32.handle, &read_mask)) {
 	    PF *hdl = fd_table[fd].read_handler;
 	    void *hdl_data = fd_table[fd].read_data;
 	    commUpdateReadHandler(fd, NULL, NULL);
@@ -220,7 +220,7 @@
 	    else
 		debug(5, 1) ("comm_select_incoming: FD %d NULL read handler\n", fd);
 	}
-	if (FD_ISSET(fd, &write_mask)) {
+	if (__WSAFDIsSet(fd_table[fd].win32.handle, &write_mask)) {
 	    PF *hdl = fd_table[fd].write_handler;
 	    void *hdl_data = fd_table[fd].write_data;
 	    commUpdateWriteHandler(fd, NULL, NULL);
@@ -397,7 +397,6 @@
 	}
 	if (num == 0)
 	    continue;
-
 	assert(errfds.fd_count <= (unsigned int) Biggest_FD);
 	for (j = 0; j < (int) errfds.fd_count; j++) {
 	    register int errfds_handle = errfds.fd_array[j];
@@ -408,15 +407,17 @@
 	    }
 	    if (fd_table[fd].flags.open) {
 		F = &fd_table[fd];
+		debug(5, 6) ("comm_select: FD %d ready for %s\n", fd,
+		    __WSAFDIsSet(fd_table[fd].win32.handle, &errfds) ? "write" : "");
 		if (F->write_handler) {
 		    int do_write = 0;
 		    switch (F->write_pending) {
 		    case COMM_PENDING_WANTS_READ:
-			do_write = FD_ISSET(fd, &readfds);
+			do_write = __WSAFDIsSet(fd_table[fd].win32.handle, &readfds);
 			break;
 		    case COMM_PENDING_NORMAL:
 		    case COMM_PENDING_WANTS_WRITE:
-			do_write = FD_ISSET(fd, &writefds);
+			do_write = __WSAFDIsSet(fd_table[fd].win32.handle, &writefds);
 			break;
 		    case COMM_PENDING_NOW:
 			do_write = 1;
@@ -468,24 +469,24 @@
 	    }
 	    F = &fd_table[fd];
 	    debug(5, 6) ("comm_select: FD %d ready for %s%s\n", fd,
-		FD_ISSET(fd, &readfds) ? "read" : "",
-		FD_ISSET(fd, &writefds) ? "write" : "");
+		__WSAFDIsSet(fd_table[fd].win32.handle, &readfds) ? "read" : "",
+		__WSAFDIsSet(fd_table[fd].win32.handle, &writefds) ? "write" : "");
 	    if (F->read_handler) {
 		int do_read = 0;
 		switch (F->read_pending) {
 		case COMM_PENDING_NORMAL:
 		case COMM_PENDING_WANTS_READ:
-		    do_read = FD_ISSET(fd, &readfds);
+		    do_read = __WSAFDIsSet(fd_table[fd].win32.handle, &readfds);
 		    break;
 		case COMM_PENDING_WANTS_WRITE:
-		    do_read = FD_ISSET(fd, &writefds);
+		    do_read = __WSAFDIsSet(fd_table[fd].win32.handle, &writefds);
 		    break;
 		case COMM_PENDING_NOW:
 		    do_read = 1;
 		    break;
 		}
 #if DELAY_POOLS
-		if (do_read && FD_ISSET(fd, &slowfds))
+		if (do_read && __WSAFDIsSet(fd_table[fd].win32.handle, &slowfds))
 		    commAddSlowFd(fd);
 		else
 #endif
@@ -508,11 +509,11 @@
 		int do_write = 0;
 		switch (F->write_pending) {
 		case COMM_PENDING_WANTS_READ:
-		    do_write = FD_ISSET(fd, &readfds);
+		    do_write = __WSAFDIsSet(fd_table[fd].win32.handle, &readfds);
 		    break;
 		case COMM_PENDING_NORMAL:
 		case COMM_PENDING_WANTS_WRITE:
-		    do_write = FD_ISSET(fd, &writefds);
+		    do_write = __WSAFDIsSet(fd_table[fd].win32.handle, &writefds);
 		    break;
 		case COMM_PENDING_NOW:
 		    do_write = 1;
@@ -634,9 +635,9 @@
 	FD_ZERO(&read_x);
 	FD_ZERO(&write_x);
 	tv.tv_sec = tv.tv_usec = 0;
-	if (FD_ISSET(fd, readfds))
+	if (__WSAFDIsSet(fd_table[fd].win32.handle, readfds))
 	    FD_SET(fd, &read_x);
-	else if (FD_ISSET(fd, writefds))
+	else if (__WSAFDIsSet(fd_table[fd].win32.handle, writefds))
 	    FD_SET(fd, &write_x);
 	else
 	    continue;