remove lotsa casts

diff --git a/src/client_side.cc b/src/client_side.cc
index a1de5396677eefcbbdd0e22bdabd855b4a1c1c0d..4d9dfeee67cdccc573174a307320db3f74c50a8f 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.96 1997/04/28 04:23:00 wessels Exp $
+ * $Id: client_side.cc,v 1.97 1997/04/28 05:32:40 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -193,7 +193,7 @@ clientRedirectDone(void *data, char *result)
        commSetSelect(fd,
            COMM_SELECT_READ,
            icpDetectClientClose,
-           (void *) icpState,
+           icpState,
            0);
     }
     icpProcessRequest(fd, icpState);
@@ -287,7 +287,7 @@ proxyAuthenticate(const char *headers)
                while (user != NULL) {
                    if (strlen(user) > 1 && strlen(passwd) > 1) {
                        debug(33, 6, "proxyAuthenticate: adding %s, %s to hash table\n", user, passwd);
-                       hash_insert(validated, xstrdup(user), (void *) xstrdup(passwd));
+                       hash_insert(validated, xstrdup(user), xstrdup(passwd));
                    }
                    user = strtok(NULL, ":");
                    passwd = strtok(NULL, "\n");
@@ -328,7 +328,7 @@ proxyAuthenticate(const char *headers)
     }
     debug(33, 5, "proxyAuthenticate: user %s validated\n", sent_user);
     hash_delete(validated, sent_user);
-    hash_insert(validated, xstrdup(sent_user), (void *) xstrdup(passwd));
+    hash_insert(validated, xstrdup(sent_user), xstrdup(passwd));
 
     xfree(clear_userandpw);
     return (sent_user);
@@ -364,7 +364,7 @@ icpProcessExpired(int fd, void *data)
     icpState->entry = entry;
     icpState->out_offset = 0;
     /* Register with storage manager to receive updates when data comes in. */
-    storeRegister(entry, fd, icpHandleIMSReply, (void *) icpState);
+    storeRegister(entry, fd, icpHandleIMSReply, icpState);
     protoDispatch(fd, icpState->entry, icpState->request);
 }
 
@@ -422,7 +422,7 @@ icpHandleIMSReply(int fd, StoreEntry * entry, void *data)
        storeRegister(entry,
            fd,
            icpHandleIMSReply,
-           (void *) icpState);
+           icpState);
        return;
     } else if (clientGetsOldEntry(entry, icpState->old_entry, icpState->request)) {
        /* We initiated the IMS request, the client is not expecting
@@ -433,7 +433,7 @@ icpHandleIMSReply(int fd, StoreEntry * entry, void *data)
            storeRegister(entry,
                fd,
                icpHandleIMSReply,
-               (void *) icpState);
+               icpState);
            return;
        }
        icpState->log_type = LOG_TCP_REFRESH_HIT;
@@ -573,6 +573,6 @@ clientPurgeRequest(icpStateData * icpState)
        strlen(msg),
        30,
        icpSendERRORComplete,
-       (void *) icpState,
+       icpState,
        NULL);
 }

diff --git a/src/comm.cc b/src/comm.cc
index dc0dc23495456548029b0c8b9e04ecf28b77d7ff..45f8ca0579db7ce9b9448fb6e825812b9675f687 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.141 1997/04/28 04:23:01 wessels Exp $
+ * $Id: comm.cc,v 1.142 1997/04/28 05:32:41 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -1513,7 +1513,7 @@ commHandleWrite(int fd, RWStateData * state)
                fd, xstrerror());
            commSetSelect(fd,
                COMM_SELECT_WRITE,
-               (PF) commHandleWrite,
+               commHandleWrite,
                state,
                0);
        } else {
@@ -1528,7 +1528,7 @@ commHandleWrite(int fd, RWStateData * state)
            /* Not done, reinstall the write handler and write some more */
            commSetSelect(fd,
                COMM_SELECT_WRITE,
-               (PF) commHandleWrite,
+               commHandleWrite,
                state,
                0);
        } else {
@@ -1565,7 +1565,7 @@ comm_write(int fd, char *buf, int size, int timeout, rw_complete_handler * handl
     fd_table[fd].rwstate = state;
     commSetSelect(fd,
        COMM_SELECT_WRITE,
-       (PF) commHandleWrite,
+       commHandleWrite,
        fd_table[fd].rwstate,
        0);
 }

diff --git a/src/disk.cc b/src/disk.cc
index bd1b3284f7abf59bff7d02e1c7cf7314d1d4fe0e..a6505a2da354af92d3e173a1f42a4b506faab5f7 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: disk.cc,v 1.58 1997/04/28 04:23:03 wessels Exp $
+ * $Id: disk.cc,v 1.59 1997/04/28 05:32:41 wessels Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -376,13 +376,13 @@ diskHandleWrite(int fd, FileEntry * entry)
     }
     ctrlp = xcalloc(1, sizeof(disk_ctrl_t));
     ctrlp->fd = fd;
-    ctrlp->data = (void *) entry;
+    ctrlp->data = entry;
 #if USE_ASYNC_IO
     aioWrite(fd,
        entry->write_q->buf + entry->write_q->cur_offset,
        entry->write_q->len - entry->write_q->cur_offset,
        diskHandleWriteComplete,
-       (void *) ctrlp);
+       ctrlp);
     return DISK_OK;
 #else
     len = write(fd,
@@ -443,8 +443,8 @@ diskHandleWriteComplete(void *data, int retcode, int errcode)
        /* another block is queued */
        commSetSelect(fd,
            COMM_SELECT_WRITE,
-           (PF) diskHandleWrite,
-           (void *) entry,
+           diskHandleWrite,
+           entry,
            0);
        return DISK_OK;
     }
@@ -503,8 +503,8 @@ file_write(int fd,
 #else
        commSetSelect(fd,
            COMM_SELECT_WRITE,
-           (PF) diskHandleWrite,
-           (void *) &file_table[fd],
+           diskHandleWrite,
+           &file_table[fd],
            0);
 #endif
        file_table[fd].write_daemon = PRESENT;
@@ -522,7 +522,7 @@ diskHandleRead(int fd, dread_ctrl * ctrl_dat)
     disk_ctrl_t *ctrlp;
     ctrlp = xcalloc(1, sizeof(disk_ctrl_t));
     ctrlp->fd = fd;
-    ctrlp->data = (void *) ctrl_dat;
+    ctrlp->data = ctrl_dat;
     /* go to requested position. */
     lseek(fd, ctrl_dat->offset, SEEK_SET);
     file_table[fd].at_eof = NO;
@@ -531,7 +531,7 @@ diskHandleRead(int fd, dread_ctrl * ctrl_dat)
        ctrl_dat->buf + ctrl_dat->cur_len,
        ctrl_dat->req_len - ctrl_dat->cur_len,
        diskHandleReadComplete,
-       (void *) ctrlp);
+       ctrlp);
     return DISK_OK;
 #else
     len = read(fd,
@@ -554,8 +554,8 @@ diskHandleReadComplete(void *data, int retcode, int errcode)
        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
            commSetSelect(fd,
                COMM_SELECT_READ,
-               (PF) diskHandleRead,
-               (void *) ctrl_dat,
+               diskHandleRead,
+               ctrl_dat,
                0);
            return DISK_OK;
        }
@@ -586,8 +586,8 @@ diskHandleReadComplete(void *data, int retcode, int errcode)
     if (ctrl_dat->cur_len < ctrl_dat->req_len) {
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) diskHandleRead,
-           (void *) ctrl_dat,
+           diskHandleRead,
+           ctrl_dat,
            0);
        return DISK_OK;
     } else {
@@ -628,8 +628,8 @@ file_read(int fd, char *buf, int req_len, int offset, FILE_READ_HD handler, void
 #else
     commSetSelect(fd,
        COMM_SELECT_READ,
-       (PF) diskHandleRead,
-       (void *) ctrl_dat,
+       diskHandleRead,
+       ctrl_dat,
        0);
 #endif
     return DISK_OK;
@@ -644,7 +644,7 @@ diskHandleWalk(int fd, dwalk_ctrl * walk_dat)
     disk_ctrl_t *ctrlp;
     ctrlp = xcalloc(1, sizeof(disk_ctrl_t));
     ctrlp->fd = fd;
-    ctrlp->data = (void *) walk_dat;
+    ctrlp->data = walk_dat;
 
     lseek(fd, walk_dat->offset, SEEK_SET);
     file_table[fd].at_eof = NO;
@@ -652,7 +652,7 @@ diskHandleWalk(int fd, dwalk_ctrl * walk_dat)
     aioRead(fd, walk_dat->buf,
        DISK_LINE_LEN - 1,
        diskHandleWalkComplete,
-       (void *) ctrlp);
+       ctrlp);
     return DISK_OK;
 #else
     len = read(fd, walk_dat->buf, DISK_LINE_LEN - 1);
@@ -681,8 +681,8 @@ diskHandleWalkComplete(void *data, int retcode, int errcode)
 
     if (len < 0) {
        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
-           commSetSelect(fd, COMM_SELECT_READ, (PF) diskHandleWalk,
-               (void *) walk_dat, 0);
+           commSetSelect(fd, COMM_SELECT_READ, diskHandleWalk,
+               walk_dat, 0);
            return DISK_OK;
        }
        debug(50, 1, "diskHandleWalk: FD %d: error readingd: %s\n",
@@ -721,8 +721,8 @@ diskHandleWalkComplete(void *data, int retcode, int errcode)
     walk_dat->offset += used_bytes;
 
     /* reschedule it for next line. */
-    commSetSelect(fd, COMM_SELECT_READ, (PF) diskHandleWalk,
-       (void *) walk_dat,
+    commSetSelect(fd, COMM_SELECT_READ, diskHandleWalk,
+       walk_dat,
        0);
     return DISK_OK;
 }
@@ -754,8 +754,8 @@ file_walk(int fd,
 #if USE_ASYNC_IO
     diskHandleWalk(fd, walk_dat);
 #else
-    commSetSelect(fd, COMM_SELECT_READ, (PF) diskHandleWalk,
-       (void *) walk_dat,
+    commSetSelect(fd, COMM_SELECT_READ, diskHandleWalk,
+       walk_dat,
        0);
 #endif
     return DISK_OK;

diff --git a/src/ftp.cc b/src/ftp.cc
index e6692b24bd043b18483d0691ea589d9d89c7cdab..32cb8b2d1e3965fc8465ba6ebb6ead4470d6285f 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.99 1997/04/28 04:23:08 wessels Exp $
+ * $Id: ftp.cc,v 1.100 1997/04/28 05:32:42 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -300,8 +300,8 @@ ftpReadReply(int fd, FtpStateData * data)
         * when Gap is big enough. */
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) ftpReadReply,
-           (void *) data, 0);
+           ftpReadReply,
+           data, 0);
        if (!BIT_TEST(entry->flag, READ_DEFERRED)) {
            /* NOTE there is no read timeout handler to disable */
            BIT_SET(entry->flag, READ_DEFERRED);
@@ -327,7 +327,7 @@ ftpReadReply(int fd, FtpStateData * data)
            /* reinstall handlers */
            /* XXX This may loop forever */
            commSetSelect(fd, COMM_SELECT_READ,
-               (PF) ftpReadReply, (void *) data, 0);
+               ftpReadReply, data, 0);
            /* note there is no ftpReadReplyTimeout.  Timeouts are handled
             * by `ftpget'. */
        } else {
@@ -382,12 +382,12 @@ ftpReadReply(int fd, FtpStateData * data)
            ftpProcessReplyHeader(data, buf, len);
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) ftpReadReply,
-           (void *) data, 0);
+           ftpReadReply,
+           data, 0);
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
-           (PF) ftpLifetimeExpire,
-           (void *) data,
+           ftpLifetimeExpire,
+           data,
            Config.readTimeout);
     }
     return 0;
@@ -414,12 +414,12 @@ ftpSendComplete(int fd, char *buf, int size, int errflag, void *data)
     }
     commSetSelect(ftpState->ftp_fd,
        COMM_SELECT_READ,
-       (PF) ftpReadReply,
-       (void *) ftpState, 0);
+       ftpReadReply,
+       ftpState, 0);
     commSetSelect(ftpState->ftp_fd,
        COMM_SELECT_TIMEOUT,
-       (PF) ftpLifetimeExpire,
-       (void *) ftpState, Config.readTimeout);
+       ftpLifetimeExpire,
+       ftpState, Config.readTimeout);
 }
 
 static const char *
@@ -516,7 +516,7 @@ ftpSendRequest(int fd, FtpStateData * data)
        strlen(buf),
        30,
        ftpSendComplete,
-       (void *) data,
+       data,
        put_free_8k_page);
 }
 
@@ -634,8 +634,8 @@ ftpStartComplete(void *data, int status)
     /* Pipe/socket created ok */
     /* register close handler */
     comm_add_close_handler(ftpData->ftp_fd,
-       (PF) ftpStateFree,
-       (void *) ftpData);
+       ftpStateFree,
+       ftpData);
     /* Now connect ... */
     commConnectStart(ftpData->ftp_fd,
        localhost,
@@ -659,14 +659,14 @@ ftpConnectDone(int fd, int status, void *data)
     fd_note(fd, ftpData->entry->url);
     commSetSelect(fd,
        COMM_SELECT_WRITE,
-       (PF) ftpSendRequest,
-       (void *) data, 0);
+       ftpSendRequest,
+       data, 0);
     comm_set_fd_lifetime(fd,
        Config.lifetimeDefault);
     commSetSelect(fd,
        COMM_SELECT_LIFETIME,
-       (PF) ftpLifetimeExpire,
-       (void *) ftpData, 0);
+       ftpLifetimeExpire,
+       ftpData, 0);
     if (opt_no_ipcache)
        ipcacheInvalidate(ftpData->request->host);
 }
@@ -697,8 +697,8 @@ ftpServerClose(void)
        return;
     commSetSelect(ftpget_server_read,
        COMM_SELECT_READ,
-       (PF) NULL,
-       (void *) NULL, 0);
+       NULL,
+       NULL, 0);
     fdstat_close(ftpget_server_read);
     close(ftpget_server_read);
     fdstat_close(ftpget_server_write);
@@ -772,8 +772,8 @@ ftpInitialize(void)
        /* if ftpget -S goes away, this handler should get called */
        commSetSelect(ftpget_to_squid[0],
            COMM_SELECT_READ,
-           (PF) ftpServerClosed,
-           (void *) NULL, 0);
+           ftpServerClosed,
+           NULL, 0);
        ftpget_server_write = squid_to_ftpget[1];
        ftpget_server_read = ftpget_to_squid[0];
        slp.tv_sec = 0;

diff --git a/src/gopher.cc b/src/gopher.cc
index 360270532f324013824f238f107fd16ec8ee9096..fd2fd775f86b2b7c990730e736e1ec51a67cfa71 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: gopher.cc,v 1.73 1997/03/04 05:16:30 wessels Exp $
+ * $Id: gopher.cc,v 1.74 1997/04/28 05:32:43 wessels Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -740,8 +740,8 @@ gopherReadReply(int fd, GopherStateData * data)
         * Gap is big enough.  */
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) gopherReadReply,
-           (void *) data, 0);
+           gopherReadReply,
+           data, 0);
        /* don't install read timeout until we are below the GAP */
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
@@ -776,12 +776,12 @@ gopherReadReply(int fd, GopherStateData * data)
            /* XXX This may loop forever */
            commSetSelect(fd,
                COMM_SELECT_READ,
-               (PF) gopherReadReply,
-               (void *) data, 0);
+               gopherReadReply,
+               data, 0);
            commSetSelect(fd,
                COMM_SELECT_TIMEOUT,
-               (PF) gopherReadReplyTimeout,
-               (void *) data,
+               gopherReadReplyTimeout,
+               data,
                Config.readTimeout);
        } else {
            BIT_RESET(entry->flag, ENTRY_CACHABLE);
@@ -824,12 +824,12 @@ gopherReadReply(int fd, GopherStateData * data)
        }
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) gopherReadReply,
-           (void *) data, 0);
+           gopherReadReply,
+           data, 0);
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
-           (PF) gopherReadReplyTimeout,
-           (void *) data,
+           gopherReadReplyTimeout,
+           data,
            Config.readTimeout);
     }
     put_free_4k_page(buf);
@@ -893,12 +893,12 @@ gopherSendComplete(int fd, char *buf, int size, int errflag, void *data)
     /* Schedule read reply. */
     commSetSelect(fd,
        COMM_SELECT_READ,
-       (PF) gopherReadReply,
-       (void *) gopherState, 0);
+       gopherReadReply,
+       gopherState, 0);
     commSetSelect(fd,
        COMM_SELECT_TIMEOUT,
-       (PF) gopherReadReplyTimeout,
-       (void *) gopherState,
+       gopherReadReplyTimeout,
+       gopherState,
        Config.readTimeout);
     comm_set_fd_lifetime(fd, 86400);   /* extend lifetime */
 
@@ -929,7 +929,7 @@ gopherSendRequest(int fd, GopherStateData * data)
        strlen(buf),
        30,
        gopherSendComplete,
-       (void *) data,
+       data,
        put_free_4k_page);
     if (BIT_TEST(data->entry->flag, ENTRY_CACHABLE))
        storeSetPublicKey(data->entry);         /* Make it public */
@@ -973,8 +973,8 @@ gopherStartComplete(void *datap, int status)
        return;
     }
     comm_add_close_handler(sock,
-       (PF) gopherStateFree,
-       (void *) data);
+       gopherStateFree,
+       data);
     /* check if IP is already in cache. It must be. 
      * It should be done before this route is called. 
      * Otherwise, we cannot check return code for connect. */
@@ -1025,12 +1025,12 @@ gopherConnectDone(int fd, int status, void *data)
        ipcacheInvalidate(gopherState->host);
     commSetSelect(fd,
        COMM_SELECT_LIFETIME,
-       (PF) gopherLifetimeExpire,
-       (void *) gopherState, 0);
+       gopherLifetimeExpire,
+       gopherState, 0);
     commSetSelect(fd,
        COMM_SELECT_WRITE,
-       (PF) gopherSendRequest,
-       (void *) gopherState, 0);
+       gopherSendRequest,
+       gopherState, 0);
 }
 
 

diff --git a/src/http.cc b/src/http.cc
index 23c8b7428217e0ff6808f216cfcc3438dc8a64c4..9aab2f529175b1cd1a62dd2c0b2b4516b15fd561 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: http.cc,v 1.154 1997/04/28 04:23:11 wessels Exp $
+ * $Id: http.cc,v 1.155 1997/04/28 05:32:43 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -589,13 +589,13 @@ httpReadReply(int fd, void *data)
        commSetSelect(fd,
            COMM_SELECT_READ,
            httpReadReply,
-           (void *) httpState, 0);
+           httpState, 0);
        /* disable read timeout until we are below the GAP */
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
            NULL,
-           (void *) NULL,
-           (time_t) 0);
+           NULL,
+           0);
        if (!BIT_TEST(entry->flag, READ_DEFERRED)) {
            comm_set_fd_lifetime(fd, 3600);     /* limit during deferring */
            BIT_SET(entry->flag, READ_DEFERRED);
@@ -621,9 +621,9 @@ httpReadReply(int fd, void *data)
            /* reinstall handlers */
            /* XXX This may loop forever */
            commSetSelect(fd, COMM_SELECT_READ,
-               httpReadReply, (void *) httpState, 0);
+               httpReadReply, httpState, 0);
            commSetSelect(fd, COMM_SELECT_TIMEOUT,
-               httpReadReplyTimeout, (void *) httpState, Config.readTimeout);
+               httpReadReplyTimeout, httpState, Config.readTimeout);
        } else {
            BIT_RESET(entry->flag, ENTRY_CACHABLE);
            storeReleaseRequest(entry);
@@ -658,12 +658,12 @@ httpReadReply(int fd, void *data)
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
            httpReadReplyTimeout,
-           (void *) httpState,
+           httpState,
            Config.readTimeout);
        commSetSelect(fd,
            COMM_SELECT_READ,
            httpReadReply,
-           (void *) httpState, 0);
+           httpState, 0);
     }
 }
 
@@ -688,11 +688,11 @@ httpSendComplete(int fd, char *buf, int size, int errflag, void *data)
        commSetSelect(fd,
            COMM_SELECT_READ,
            httpReadReply,
-           (void *) httpState, 0);
+           httpState, 0);
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
            httpReadReplyTimeout,
-           (void *) httpState,
+           httpState,
            Config.readTimeout);
        comm_set_fd_lifetime(fd, 86400);        /* extend lifetime */
     }
@@ -945,7 +945,7 @@ proxyhttpStartComplete(void *data, int status)
     /* register the handler to free HTTP state data when the FD closes */
     comm_add_close_handler(httpState->fd,
        httpStateFree,
-       (void *) httpState);
+       httpState);
     request->method = orig_request->method;
     xstrncpy(request->host, e->host, SQUIDHOSTNAMELEN);
     request->port = e->http_port;
@@ -997,9 +997,9 @@ httpConnectDone(int fd, int status, void *data)
            ipcacheInvalidate(request->host);
        fd_note(fd, entry->url);
        commSetSelect(fd, COMM_SELECT_LIFETIME,
-           httpLifetimeExpire, (void *) httpState, 0);
+           httpLifetimeExpire, httpState, 0);
        commSetSelect(fd, COMM_SELECT_WRITE,
-           httpSendRequest, (void *) httpState, 0);
+           httpSendRequest, httpState, 0);
     }
 }
 
@@ -1064,7 +1064,7 @@ httpStartComplete(void *data, int status)
     httpState->fd = sock;
     comm_add_close_handler(httpState->fd,
        httpStateFree,
-       (void *) httpState);
+       httpState);
     httpState->ip_lookup_pending = 1;
     ipcache_nbgethostbyname(request->host,
        httpState->fd,

diff --git a/src/icmp.cc b/src/icmp.cc
index 0ad95a42582de756d3a4e05bc118e33659c0c024..626af23ec876d65538a3bbdf5109aafd4ad9e63f 100644 (file)
--- a/src/icmp.cc
+++ b/src/icmp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icmp.cc,v 1.33 1997/04/28 04:23:12 wessels Exp $
+ * $Id: icmp.cc,v 1.34 1997/04/28 05:32:44 wessels Exp $
  *
  * DEBUG: section 37    ICMP Routines
  * AUTHOR: Duane Wessels
@@ -79,8 +79,8 @@ icmpRecv(int unused1, void *unused2)
     static struct sockaddr_in F;
     commSetSelect(icmp_sock,
        COMM_SELECT_READ,
-       (PF) icmpRecv,
-       (void *) -1, 0);
+       icmpRecv,
+       -1, 0);
     memset(&preply, '\0', sizeof(pingerReplyData));
     n = recv(icmp_sock,
        (char *) &preply,
@@ -134,8 +134,8 @@ icmpQueueSend(pingerEchoData * pkt,
     *H = q;
     commSetSelect(icmp_sock,
        COMM_SELECT_WRITE,
-       (PF) icmpSend,
-       (void *) IcmpQueueHead, 0);
+       icmpSend,
+       IcmpQueueHead, 0);
 }
 
 static void
@@ -167,8 +167,8 @@ icmpSend(int fd, icmpQueueData * queue)
     if (IcmpQueueHead) {
        commSetSelect(fd,
            COMM_SELECT_WRITE,
-           (PF) icmpSend,
-           (void *) IcmpQueueHead, 0);
+           icmpSend,
+           IcmpQueueHead, 0);
     } else {
        commSetSelect(fd,
            COMM_SELECT_WRITE,
@@ -304,8 +304,8 @@ icmpOpen(void)
     comm_close(child_sock);
     commSetSelect(icmp_sock,
        COMM_SELECT_READ,
-       (PF) icmpRecv,
-       (void *) -1, 0);
+       icmpRecv,
+       -1, 0);
     comm_set_fd_lifetime(icmp_sock, -1);
     debug(29, 0, "Pinger socket opened on FD %d\n", icmp_sock);
 #endif

diff --git a/src/ident.cc b/src/ident.cc
index 36d2bd04bc51501c86015af451199e16b29a1484..d676af9b220c83104198ec88c75934eae2b78094 100644 (file)
--- a/src/ident.cc
+++ b/src/ident.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ident.cc,v 1.25 1997/03/04 05:16:34 wessels Exp $
+ * $Id: ident.cc,v 1.26 1997/04/28 05:32:46 wessels Exp $
  *
  * DEBUG: section 30    Ident (RFC 931)
  * AUTHOR: Duane Wessels
@@ -64,8 +64,8 @@ identStart(int fd, icpStateData * icpState, void (*callback) _PARAMS((void *)))
     }
     icpState->ident.fd = fd;
     comm_add_close_handler(fd,
-       (PF) identClose,
-       (void *) icpState);
+       identClose,
+       icpState);
     commConnectStart(fd,
        inet_ntoa(icpState->peer.sin_addr),
        IDENT_PORT,
@@ -91,12 +91,12 @@ identConnectDone(int fd, int status, void *data)
        strlen(reqbuf),
        5,                      /* timeout */
        identRequestComplete,
-       (void *) icpState,
+       icpState,
        NULL);
     commSetSelect(fd,
        COMM_SELECT_READ,
-       (PF) identReadReply,
-       (void *) icpState, 0);
+       identReadReply,
+       icpState, 0);
 }
 
 static void

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 3d0ba41f911c3791b9465eff0994ec6ddc8c9df8..a48fa5f815371be896c8a865a3c04f6c6f0c996c 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.109 1997/04/28 04:23:15 wessels Exp $
+ * $Id: ipcache.cc,v 1.110 1997/04/28 05:32:47 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -567,7 +567,7 @@ ipcache_dnsHandleRead(int fd, dnsserver_t * dnsData)
        if (len < 0 && (errno == EWOULDBLOCK || errno == EAGAIN || errno == EINTR)) {
            commSetSelect(fd,
                COMM_SELECT_READ,
-               (PF) ipcache_dnsHandleRead,
+               ipcache_dnsHandleRead,
                dnsData, 0);
            return;
        }
@@ -616,7 +616,7 @@ ipcache_dnsHandleRead(int fd, dnsserver_t * dnsData)
     /* reschedule */
     commSetSelect(dnsData->inpipe,
        COMM_SELECT_READ,
-       (PF) ipcache_dnsHandleRead,
+       ipcache_dnsHandleRead,
        dnsData, 0);
     ipcacheNudgeQueue();
 }
@@ -737,7 +737,7 @@ ipcache_dnsDispatch(dnsserver_t * dns, ipcache_entry * i)
        xfree);
     commSetSelect(dns->outpipe,
        COMM_SELECT_READ,
-       (PF) ipcache_dnsHandleRead,
+       ipcache_dnsHandleRead,
        dns, 0);
     debug(14, 5, "ipcache_dnsDispatch: Request sent to DNS server #%d.\n",
        dns->id);

diff --git a/src/redirect.cc b/src/redirect.cc
index 7adbf9cc4f1778a61602355ed15f75076bd42d25..776fc5da81467222709d8b6d413d12ee45c959df 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: redirect.cc,v 1.35 1997/04/28 04:23:24 wessels Exp $
+ * $Id: redirect.cc,v 1.36 1997/04/28 05:32:48 wessels Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels
@@ -195,7 +195,7 @@ redirectHandleRead(int fd, redirector_t * redirector)
     /* reschedule */
     commSetSelect(redirector->fd,
        COMM_SELECT_READ,
-       (PF) redirectHandleRead,
+       redirectHandleRead,
        redirector, 0);
     if ((t = strchr(redirector->inbuf, '\n'))) {
        /* end of record found */
@@ -404,8 +404,8 @@ redirectOpenServers(void)
            /* set handler for incoming result */
            commSetSelect(redirect_child_table[k]->fd,
                COMM_SELECT_READ,
-               (PF) redirectHandleRead,
-               (void *) redirect_child_table[k], 0);
+               redirectHandleRead,
+               redirect_child_table[k], 0);
            debug(29, 3, "redirectOpenServers: 'redirect_server' %d started\n",
                k);
        }

diff --git a/src/send-announce.cc b/src/send-announce.cc
index d21e3010f5a7842d243d3d90afd6d8dfdf0453bc..7e2db727b946470bbf71ba572e377bc34d3587ee 100644 (file)
--- a/src/send-announce.cc
+++ b/src/send-announce.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: send-announce.cc,v 1.30 1997/03/04 05:16:40 wessels Exp $
+ * $Id: send-announce.cc,v 1.31 1997/04/28 05:32:48 wessels Exp $
  *
  * DEBUG: section 27    Cache Announcer
  * AUTHOR: Duane Wessels
@@ -95,6 +95,6 @@ send_announce(int fd, const ipcache_addrs * ia, void *data)
     AppendUdp(qdata);
     commSetSelect(theOutIcpConnection,
        COMM_SELECT_WRITE,
-       (PF) icpUdpReply,
-       (void *) qdata, 0);
+       icpUdpReply,
+       qdata, 0);
 }

diff --git a/src/ssl.cc b/src/ssl.cc
index d66f08910a4bb0af1377b8850014b8b6d3cc3249..55f3a36ecdc0cfaf83dabbb85d56f9b2f4ec659a 100644 (file)
--- a/src/ssl.cc
+++ b/src/ssl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.cc,v 1.44 1997/04/28 04:23:27 wessels Exp $
+ * $Id: ssl.cc,v 1.45 1997/04/28 05:32:49 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -75,7 +75,7 @@ sslClose(SslStateData * sslState)
        /* remove the "unexpected" client close handler */
        comm_remove_close_handler(sslState->client.fd,
            sslClientClosed,
-           (void *) sslState);
+           sslState);
        comm_close(sslState->client.fd);
        sslState->client.fd = -1;
     }
@@ -151,11 +151,11 @@ sslReadServer(int fd, void *data)
            commSetSelect(sslState->server.fd,
                COMM_SELECT_READ,
                sslReadServer,
-               (void *) sslState, 0);
+               sslState, 0);
            commSetSelect(sslState->server.fd,
                COMM_SELECT_TIMEOUT,
                sslReadTimeout,
-               (void *) sslState,
+               sslState,
                sslState->timeout);
        } else {
            sslClose(sslState);
@@ -169,7 +169,7 @@ sslReadServer(int fd, void *data)
        commSetSelect(sslState->client.fd,
            COMM_SELECT_WRITE,
            sslWriteClient,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -191,7 +191,7 @@ sslReadClient(int fd, void *data)
            commSetSelect(sslState->client.fd,
                COMM_SELECT_READ,
                sslReadClient,
-               (void *) sslState, 0);
+               sslState, 0);
        } else {
            sslClose(sslState);
        }
@@ -204,7 +204,7 @@ sslReadClient(int fd, void *data)
        commSetSelect(sslState->server.fd,
            COMM_SELECT_WRITE,
            sslWriteServer,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -223,7 +223,7 @@ sslWriteServer(int fd, void *data)
            commSetSelect(sslState->server.fd,
                COMM_SELECT_WRITE,
                sslWriteServer,
-               (void *) sslState, 0);
+               sslState, 0);
            return;
        }
        debug(50, 2, "sslWriteServer: FD %d: write failure: %s.\n",
@@ -236,18 +236,18 @@ sslWriteServer(int fd, void *data)
        commSetSelect(sslState->client.fd,
            COMM_SELECT_READ,
            sslReadClient,
-           (void *) sslState, 0);
+           sslState, 0);
        commSetSelect(sslState->server.fd,
            COMM_SELECT_TIMEOUT,
            sslReadTimeout,
-           (void *) sslState,
+           sslState,
            sslState->timeout);
     } else {
        /* still have more to write */
        commSetSelect(sslState->server.fd,
            COMM_SELECT_WRITE,
            sslWriteServer,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -270,7 +270,7 @@ sslWriteClient(int fd, void *data)
            commSetSelect(sslState->client.fd,
                COMM_SELECT_WRITE,
                sslWriteClient,
-               (void *) sslState, 0);
+               sslState, 0);
            return;
        }
        debug(50, 2, "sslWriteClient: FD %d: write failure: %s.\n",
@@ -285,13 +285,13 @@ sslWriteClient(int fd, void *data)
        commSetSelect(sslState->server.fd,
            COMM_SELECT_READ,
            sslReadServer,
-           (void *) sslState, 0);
+           sslState, 0);
     } else {
        /* still have more to write */
        commSetSelect(sslState->client.fd,
            COMM_SELECT_WRITE,
            sslWriteClient,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -315,11 +315,11 @@ sslConnected(int fd, void *data)
     commSetSelect(sslState->client.fd,
        COMM_SELECT_WRITE,
        sslWriteClient,
-       (void *) sslState, 0);
+       sslState, 0);
     commSetSelect(sslState->client.fd,
        COMM_SELECT_READ,
        sslReadClient,
-       (void *) sslState, 0);
+       sslState, 0);
 }
 
 static void
@@ -354,7 +354,7 @@ sslConnect(int fd, const ipcache_addrs * ia, void *data)
            strlen(buf),
            30,
            sslErrorComplete,
-           (void *) sslState,
+           sslState,
            xfree);
        return;
     }
@@ -365,7 +365,7 @@ sslConnect(int fd, const ipcache_addrs * ia, void *data)
     commSetSelect(sslState->server.fd,
        COMM_SELECT_LIFETIME,
        sslLifetimeExpire,
-       (void *) sslState, 0);
+       sslState, 0);
     /* NOTE this changes the lifetime handler for the client side.
      * It used to be asciiConnLifetimeHandle, but it does funny things
      * like looking for read handlers and assuming it was still reading
@@ -373,7 +373,7 @@ sslConnect(int fd, const ipcache_addrs * ia, void *data)
     commSetSelect(sslState->client.fd,
        COMM_SELECT_LIFETIME,
        sslLifetimeExpire,
-       (void *) sslState, 0);
+       sslState, 0);
     commConnectStart(fd,
        sslState->host,
        sslState->port,
@@ -398,7 +398,7 @@ sslConnectDone(int fd, int status, void *data)
            strlen(buf),
            30,
            sslErrorComplete,
-           (void *) sslState,
+           sslState,
            xfree);
        return;
     }
@@ -455,10 +455,10 @@ sslStart(int fd, const char *url, request_t * request, char *mime_hdr, int *size
     sslState->client.buf = xmalloc(SQUID_TCP_SO_RCVBUF);
     comm_add_close_handler(sslState->server.fd,
        sslStateFree,
-       (void *) sslState);
+       sslState);
     comm_add_close_handler(sslState->client.fd,
        sslClientClosed,
-       (void *) sslState);
+       sslState);
     peerSelect(request,
        NULL,
        sslPeerSelectComplete,
@@ -480,11 +480,11 @@ sslProxyConnected(int fd, void *data)
     commSetSelect(sslState->server.fd,
        COMM_SELECT_WRITE,
        sslWriteServer,
-       (void *) sslState, 0);
+       sslState, 0);
     commSetSelect(sslState->server.fd,
        COMM_SELECT_READ,
        sslReadServer,
-       (void *) sslState, 0);
+       sslState, 0);
 }
 
 static void

diff --git a/src/stat.cc b/src/stat.cc
index a654a5e506f9e8a5697394d25b2b294b23f29827..b20f760e97b564be087591bfef2525b5bf3f10f3 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.133 1997/04/28 04:23:28 wessels Exp $
+ * $Id: stat.cc,v 1.134 1997/04/28 05:32:50 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -503,10 +503,10 @@ log_get_start(const cacheinfo * obj, StoreEntry * sentry)
     data->sentry = sentry;
     storeAppendPrintf(sentry, "{\n");
     file_walk(fd,
-       (FILE_WALK_HD) logReadEndHandler,
-       (void *) data,
-       (FILE_WALK_LHD) logReadHandler,
-       (void *) data);
+       logReadEndHandler,
+       data,
+       logReadHandler,
+       data);
     return;
 }
 
@@ -542,8 +542,8 @@ squid_get_start(const cacheinfo * obj, StoreEntry * sentry)
     data->sentry = sentry;
     data->fd = file_open(ConfigFile, NULL, O_RDONLY, NULL, NULL);
     storeAppendPrintf(sentry, open_bracket);
-    file_walk(data->fd, (FILE_WALK_HD) squidReadEndHandler, (void *) data,
-       (FILE_WALK_LHD) squidReadHandler, (void *) data);
+    file_walk(data->fd, squidReadEndHandler, data,
+       squidReadHandler, data);
 }
 
 

diff --git a/src/store.cc b/src/store.cc
index bbe5ab52e9240d38323d81c1b322f4a1006a371c..00fb490ba273ca9b208f62b6cc833911160efbb0 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.223 1997/04/28 05:11:47 wessels Exp $
+ * $Id: store.cc,v 1.224 1997/04/28 05:32:51 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -1099,8 +1099,8 @@ storeSwapInHandle(int fd_notused, const char *buf, int len, int flag, StoreEntry
            mem->e_swap_buf,
            SWAP_BUF,
            mem->swap_offset,
-           (FILE_READ_HD) storeSwapInHandle,
-           (void *) e);
+           storeSwapInHandle,
+           e);
        return 0;
     }
     /* complete swapping in */
@@ -1211,8 +1211,8 @@ storeSwapInStartComplete(void *data, int fd)
        mem->e_swap_buf,
        SWAP_BUF,
        mem->swap_offset,
-       (FILE_READ_HD) storeSwapInHandle,
-       (void *) e);
+       storeSwapInHandle,
+       e);
     (ctrlp->callback) (ctrlp->callback_data, 0);
     xfree(ctrlp->path);
     xfree(ctrlp);

diff --git a/src/tunnel.cc b/src/tunnel.cc
index d5e7d3aaa87465b1be57e84dde6430789b09b914..bfff0b0f28435a5b962fd2364e58421b6a2dbf99 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.44 1997/04/28 04:23:27 wessels Exp $
+ * $Id: tunnel.cc,v 1.45 1997/04/28 05:32:49 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -75,7 +75,7 @@ sslClose(SslStateData * sslState)
        /* remove the "unexpected" client close handler */
        comm_remove_close_handler(sslState->client.fd,
            sslClientClosed,
-           (void *) sslState);
+           sslState);
        comm_close(sslState->client.fd);
        sslState->client.fd = -1;
     }
@@ -151,11 +151,11 @@ sslReadServer(int fd, void *data)
            commSetSelect(sslState->server.fd,
                COMM_SELECT_READ,
                sslReadServer,
-               (void *) sslState, 0);
+               sslState, 0);
            commSetSelect(sslState->server.fd,
                COMM_SELECT_TIMEOUT,
                sslReadTimeout,
-               (void *) sslState,
+               sslState,
                sslState->timeout);
        } else {
            sslClose(sslState);
@@ -169,7 +169,7 @@ sslReadServer(int fd, void *data)
        commSetSelect(sslState->client.fd,
            COMM_SELECT_WRITE,
            sslWriteClient,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -191,7 +191,7 @@ sslReadClient(int fd, void *data)
            commSetSelect(sslState->client.fd,
                COMM_SELECT_READ,
                sslReadClient,
-               (void *) sslState, 0);
+               sslState, 0);
        } else {
            sslClose(sslState);
        }
@@ -204,7 +204,7 @@ sslReadClient(int fd, void *data)
        commSetSelect(sslState->server.fd,
            COMM_SELECT_WRITE,
            sslWriteServer,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -223,7 +223,7 @@ sslWriteServer(int fd, void *data)
            commSetSelect(sslState->server.fd,
                COMM_SELECT_WRITE,
                sslWriteServer,
-               (void *) sslState, 0);
+               sslState, 0);
            return;
        }
        debug(50, 2, "sslWriteServer: FD %d: write failure: %s.\n",
@@ -236,18 +236,18 @@ sslWriteServer(int fd, void *data)
        commSetSelect(sslState->client.fd,
            COMM_SELECT_READ,
            sslReadClient,
-           (void *) sslState, 0);
+           sslState, 0);
        commSetSelect(sslState->server.fd,
            COMM_SELECT_TIMEOUT,
            sslReadTimeout,
-           (void *) sslState,
+           sslState,
            sslState->timeout);
     } else {
        /* still have more to write */
        commSetSelect(sslState->server.fd,
            COMM_SELECT_WRITE,
            sslWriteServer,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -270,7 +270,7 @@ sslWriteClient(int fd, void *data)
            commSetSelect(sslState->client.fd,
                COMM_SELECT_WRITE,
                sslWriteClient,
-               (void *) sslState, 0);
+               sslState, 0);
            return;
        }
        debug(50, 2, "sslWriteClient: FD %d: write failure: %s.\n",
@@ -285,13 +285,13 @@ sslWriteClient(int fd, void *data)
        commSetSelect(sslState->server.fd,
            COMM_SELECT_READ,
            sslReadServer,
-           (void *) sslState, 0);
+           sslState, 0);
     } else {
        /* still have more to write */
        commSetSelect(sslState->client.fd,
            COMM_SELECT_WRITE,
            sslWriteClient,
-           (void *) sslState, 0);
+           sslState, 0);
     }
 }
 
@@ -315,11 +315,11 @@ sslConnected(int fd, void *data)
     commSetSelect(sslState->client.fd,
        COMM_SELECT_WRITE,
        sslWriteClient,
-       (void *) sslState, 0);
+       sslState, 0);
     commSetSelect(sslState->client.fd,
        COMM_SELECT_READ,
        sslReadClient,
-       (void *) sslState, 0);
+       sslState, 0);
 }
 
 static void
@@ -354,7 +354,7 @@ sslConnect(int fd, const ipcache_addrs * ia, void *data)
            strlen(buf),
            30,
            sslErrorComplete,
-           (void *) sslState,
+           sslState,
            xfree);
        return;
     }
@@ -365,7 +365,7 @@ sslConnect(int fd, const ipcache_addrs * ia, void *data)
     commSetSelect(sslState->server.fd,
        COMM_SELECT_LIFETIME,
        sslLifetimeExpire,
-       (void *) sslState, 0);
+       sslState, 0);
     /* NOTE this changes the lifetime handler for the client side.
      * It used to be asciiConnLifetimeHandle, but it does funny things
      * like looking for read handlers and assuming it was still reading
@@ -373,7 +373,7 @@ sslConnect(int fd, const ipcache_addrs * ia, void *data)
     commSetSelect(sslState->client.fd,
        COMM_SELECT_LIFETIME,
        sslLifetimeExpire,
-       (void *) sslState, 0);
+       sslState, 0);
     commConnectStart(fd,
        sslState->host,
        sslState->port,
@@ -398,7 +398,7 @@ sslConnectDone(int fd, int status, void *data)
            strlen(buf),
            30,
            sslErrorComplete,
-           (void *) sslState,
+           sslState,
            xfree);
        return;
     }
@@ -455,10 +455,10 @@ sslStart(int fd, const char *url, request_t * request, char *mime_hdr, int *size
     sslState->client.buf = xmalloc(SQUID_TCP_SO_RCVBUF);
     comm_add_close_handler(sslState->server.fd,
        sslStateFree,
-       (void *) sslState);
+       sslState);
     comm_add_close_handler(sslState->client.fd,
        sslClientClosed,
-       (void *) sslState);
+       sslState);
     peerSelect(request,
        NULL,
        sslPeerSelectComplete,
@@ -480,11 +480,11 @@ sslProxyConnected(int fd, void *data)
     commSetSelect(sslState->server.fd,
        COMM_SELECT_WRITE,
        sslWriteServer,
-       (void *) sslState, 0);
+       sslState, 0);
     commSetSelect(sslState->server.fd,
        COMM_SELECT_READ,
        sslReadServer,
-       (void *) sslState, 0);
+       sslState, 0);
 }
 
 static void

diff --git a/src/wais.cc b/src/wais.cc
index b106fcb02c6ce3a1d6fa2cdbe05a6d50f974eaee..7c0fdbc70b04ad22c57eb8e2ac8ad915482d21e6 100644 (file)
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wais.cc,v 1.63 1997/04/28 04:23:34 wessels Exp $
+ * $Id: wais.cc,v 1.64 1997/04/28 05:32:52 wessels Exp $
  *
  * DEBUG: section 24    WAIS Relay
  * AUTHOR: Harvest Derived
@@ -205,8 +205,8 @@ waisReadReply(int fd, WaisStateData * waisState)
         * when Gap is big enough. */
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) waisReadReply,
-           (void *) waisState, 0);
+           waisReadReply,
+           waisState, 0);
        /* don't install read handler while we're above the gap */
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
@@ -237,9 +237,9 @@ waisReadReply(int fd, WaisStateData * waisState)
            /* reinstall handlers */
            /* XXX This may loop forever */
            commSetSelect(fd, COMM_SELECT_READ,
-               (PF) waisReadReply, (void *) waisState, 0);
+               waisReadReply, waisState, 0);
            commSetSelect(fd, COMM_SELECT_TIMEOUT,
-               (PF) waisReadReplyTimeout, (void *) waisState, Config.readTimeout);
+               waisReadReplyTimeout, waisState, Config.readTimeout);
        } else {
            BIT_RESET(entry->flag, ENTRY_CACHABLE);
            storeReleaseRequest(entry);
@@ -260,12 +260,12 @@ waisReadReply(int fd, WaisStateData * waisState)
        storeAppend(entry, buf, len);
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) waisReadReply,
-           (void *) waisState, 0);
+           waisReadReply,
+           waisState, 0);
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
-           (PF) waisReadReplyTimeout,
-           (void *) waisState,
+           waisReadReplyTimeout,
+           waisState,
            Config.readTimeout);
     }
 }
@@ -287,12 +287,12 @@ waisSendComplete(int fd, char *buf, int size, int errflag, void *data)
        /* Schedule read reply. */
        commSetSelect(fd,
            COMM_SELECT_READ,
-           (PF) waisReadReply,
-           (void *) waisState, 0);
+           waisReadReply,
+           waisState, 0);
        commSetSelect(fd,
            COMM_SELECT_TIMEOUT,
-           (PF) waisReadReplyTimeout,
-           (void *) waisState,
+           waisReadReplyTimeout,
+           waisState,
            Config.readTimeout);
     }
 }
@@ -374,8 +374,8 @@ waisStartComplete(void *data, int status)
     WaisStateData *waisState = (WaisStateData *) data;
 
     comm_add_close_handler(waisState->fd,
-       (PF) waisStateFree,
-       (void *) waisState);
+       waisStateFree,
+       waisState);
     waisState->ip_lookup_pending = 1;
     ipcache_nbgethostbyname(waisState->relayhost,
        waisState->fd,
@@ -416,10 +416,10 @@ waisConnectDone(int fd, int status, void *data)
        ipcacheInvalidate(waisState->relayhost);
     commSetSelect(fd,
        COMM_SELECT_LIFETIME,
-       (PF) waisLifetimeExpire,
-       (void *) waisState, 0);
+       waisLifetimeExpire,
+       waisState, 0);
     commSetSelect(fd,
        COMM_SELECT_WRITE,
-       (PF) waisSendRequest,
-       (void *) waisState, 0);
+       waisSendRequest,
+       waisState, 0);
 }