--------------------- PatchSet 7154 Date: 2005/11/02 02:27:51 Author: adri Branch: tidyup_deferred_reads Tag: (none) Log: Remove commSetDefer() Members: src/comm.c:1.18.6.5.6.5->1.18.6.5.6.6 src/protos.h:1.41.6.22.6.5->1.41.6.22.6.6 Index: squid/src/comm.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/comm.c,v retrieving revision 1.18.6.5.6.5 retrieving revision 1.18.6.5.6.6 diff -u -r1.18.6.5.6.5 -r1.18.6.5.6.6 --- squid/src/comm.c 26 Oct 2005 04:49:31 -0000 1.18.6.5.6.5 +++ squid/src/comm.c 2 Nov 2005 02:27:51 -0000 1.18.6.5.6.6 @@ -1,6 +1,6 @@ /* - * $Id: comm.c,v 1.18.6.5.6.5 2005/10/26 04:49:31 adri Exp $ + * $Id: comm.c,v 1.18.6.5.6.6 2005/11/02 02:27:51 adri Exp $ * * DEBUG: section 5 Socket Functions * AUTHOR: Harvest Derived @@ -692,14 +692,6 @@ } void -commSetDefer(int fd, DEFER * func, void *data) -{ - fde *F = &fd_table[fd]; - F->defer_check = func; - F->defer_data = data; -} - -void commSetSelect(int fd, unsigned int type, PF * handler, void *client_data, time_t timeout) { fde *F = &fd_table[fd]; Index: squid/src/protos.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/protos.h,v retrieving revision 1.41.6.22.6.5 retrieving revision 1.41.6.22.6.6 diff -u -r1.41.6.22.6.5 -r1.41.6.22.6.6 --- squid/src/protos.h 13 Oct 2005 09:14:35 -0000 1.41.6.22.6.5 +++ squid/src/protos.h 2 Nov 2005 02:27:51 -0000 1.41.6.22.6.6 @@ -1,6 +1,6 @@ /* - * $Id: protos.h,v 1.41.6.22.6.5 2005/10/13 09:14:35 adri Exp $ + * $Id: protos.h,v 1.41.6.22.6.6 2005/11/02 02:27:51 adri Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -172,7 +172,6 @@ extern void comm_write_mbuf(int fd, MemBuf mb, CWCB * handler, void *handler_data); extern void commCallCloseHandlers(int fd); extern int commSetTimeout(int fd, int, PF *, void *); -extern void commSetDefer(int fd, DEFER * func, void *); extern int ignoreErrno(int); extern void commCloseAllSockets(void); extern void commDeferReadUntil(int fd, int time, PF *handler, void *data);