From: Automatic source maintenance Date: Sat, 18 Jun 2011 00:12:51 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: take08~55^2~122 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc49061a590dfa22d96b9722000cbb584b24ac51;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt index 4ab90d7ef3..0fc9d5f877 100644 --- a/doc/debug-sections.txt +++ b/doc/debug-sections.txt @@ -18,6 +18,7 @@ section 03 Configuration Settings section 04 Error Generation section 05 Comm section 05 Listener Socket Handler +section 05 Socket Connection Opener section 05 Socket Functions section 06 Disk I/O Routines section 07 Multicast diff --git a/scripts/mk-error-details-po.pl b/scripts/mk-error-details-po.pl old mode 100644 new mode 100755 diff --git a/src/ProtoPort.cc b/src/ProtoPort.cc index f9b37e292e..d558751c99 100644 --- a/src/ProtoPort.cc +++ b/src/ProtoPort.cc @@ -11,7 +11,8 @@ http_port_list::http_port_list(const char *aProtocol) #if USE_SSL - : http(*this), + : + http(*this), dynamicCertMemCacheSize(std::numeric_limits::max()) #endif { diff --git a/src/client_side.cc b/src/client_side.cc index 4a709fc9ba..e6e3181e9d 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -2733,7 +2733,7 @@ ConnStateData::clientParseRequests() if (context) { debugs(33, 5, HERE << clientConnection << ": parsed a request"); AsyncCall::Pointer timeoutCall = commCbCall(5, 4, "clientLifetimeTimeout", - CommTimeoutCbPtrFun(clientLifetimeTimeout, context->http)); + CommTimeoutCbPtrFun(clientLifetimeTimeout, context->http)); commSetConnTimeout(clientConnection, Config.Timeout.lifetime, timeoutCall); clientProcessRequest(this, &parser_, context, method, http_ver); diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc index dd1b360f76..e5417ce093 100644 --- a/src/comm/ConnOpener.cc +++ b/src/comm/ConnOpener.cc @@ -12,8 +12,9 @@ #include "ipcache.h" #include "SquidTime.h" -namespace Comm { - CBDATA_CLASS_INIT(ConnOpener); +namespace Comm +{ +CBDATA_CLASS_INIT(ConnOpener); }; Comm::ConnOpener::ConnOpener(Comm::ConnectionPointer &c, AsyncCall::Pointer &handler, time_t ctimeout) : @@ -232,7 +233,7 @@ Comm::ConnOpener::connect() failRetries_++; // check for timeout FIRST. - if(squid_curtime - connectStart_ > connectTimeout_) { + if (squid_curtime - connectStart_ > connectTimeout_) { debugs(5, 5, HERE << conn_ << ": * - ERR took too long to receive response."); calls_.earlyAbort_->cancel("Comm::ConnOpener::connect timed out"); calls_.earlyAbort_ = NULL; diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h index 594fe61993..06ace783dc 100644 --- a/src/comm/ConnOpener.h +++ b/src/comm/ConnOpener.h @@ -8,7 +8,8 @@ #include "comm_err_t.h" #include "comm/forward.h" -namespace Comm { +namespace Comm +{ /** * Async-opener of a Comm connection. diff --git a/src/comm/Connection.h b/src/comm/Connection.h index 4245225c8a..3b7e4e6614 100644 --- a/src/comm/Connection.h +++ b/src/comm/Connection.h @@ -58,7 +58,8 @@ struct peer; -namespace Comm { +namespace Comm +{ /* TODO: make these a struct of boolean flags members in the connection instead of a bitmap. * we can't do that until all non-comm code uses Commm::Connection objects to create FD diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc index 2f31d99a16..0d80fb4713 100644 --- a/src/comm/ModPoll.cc +++ b/src/comm/ModPoll.cc @@ -285,7 +285,7 @@ comm_poll_icp_incoming(void) fds[nfds++] = icpIncomingConn->fd; if (icpIncomingConn != icpOutgoingConn && Comm::IsConnOpen(icpOutgoingConn)) - fds[nfds++] = icpOutgoingConn->fd; + fds[nfds++] = icpOutgoingConn->fd; if (nfds == 0) return; diff --git a/src/comm/forward.h b/src/comm/forward.h index a08d82ea4f..ad333d0900 100644 --- a/src/comm/forward.h +++ b/src/comm/forward.h @@ -4,7 +4,8 @@ #include "Array.h" #include "RefCount.h" -namespace Comm { +namespace Comm +{ class Connection; diff --git a/src/errorpage.cc b/src/errorpage.cc index 97b10d1797..7a6d7a683f 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -136,7 +136,8 @@ static IOCB errorSendComplete; /// \ingroup ErrorPageInternal /// manages an error page template -class ErrorPageFile: public TemplateFile { +class ErrorPageFile: public TemplateFile +{ public: ErrorPageFile(const char *name): TemplateFile(name) { textBuf.init();} @@ -366,14 +367,13 @@ TemplateFile::loadFromFile(const char *path) bool strHdrAcptLangGetItem(const String &hdr, char *lang, int langLen, size_t &pos) { - while(pos < hdr.size()) { + while (pos < hdr.size()) { char *dt = lang; if (!pos) { /* skip any initial whitespace. */ while (pos < hdr.size() && xisspace(hdr[pos])) pos++; - } - else { + } else { // IFF we terminated the tag on whitespace or ';' we need to skip to the next ',' or end of header. while (pos < hdr.size() && hdr[pos] != ',') pos++; if (hdr[pos] == ',') pos++; diff --git a/src/errorpage.h b/src/errorpage.h index ab355f990a..8eb3cb0cae 100644 --- a/src/errorpage.h +++ b/src/errorpage.h @@ -256,10 +256,11 @@ SQUIDCEXTERN const char *errorPageName(int pageId); ///< error ID to string * loads text templates used for error pages and details; * supports translation of templates */ -class TemplateFile { +class TemplateFile +{ public: TemplateFile(const char *name); - virtual ~TemplateFile(){} + virtual ~TemplateFile() {} /// return true if the data loaded from disk without any problem bool loaded() const {return wasLoaded;} diff --git a/src/gopher.cc b/src/gopher.cc index 605074e80a..a83991dcdd 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -1036,6 +1036,6 @@ gopherStart(FwdState * fwd) gopherState->serverConn = fwd->serverConnection(); gopherSendRequest(fwd->serverConnection()->fd, gopherState); AsyncCall::Pointer timeoutCall = commCbCall(5, 4, "gopherTimeout", - CommTimeoutCbPtrFun(gopherTimeout, gopherState)); + CommTimeoutCbPtrFun(gopherTimeout, gopherState)); commSetConnTimeout(fwd->serverConnection(), Config.Timeout.read, timeoutCall); } diff --git a/src/helper.cc b/src/helper.cc index 9099fd9fe7..c1332329af 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -93,15 +93,15 @@ HelperServerBase::closePipesSafely() writePipe->close(); #ifdef _SQUID_MSWIN_ - if (hIpc) { - if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) { - getCurrentTime(); - debugs(84, DBG_IMPORTANT, "WARNING: " << hlp->id_name << - " #" << no << " (" << hlp->cmdline->key << "," << - (long int)pid << ") didn't exit in 5 seconds"); - } - CloseHandle(hIpc); + if (hIpc) { + if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) { + getCurrentTime(); + debugs(84, DBG_IMPORTANT, "WARNING: " << hlp->id_name << + " #" << no << " (" << hlp->cmdline->key << "," << + (long int)pid << ") didn't exit in 5 seconds"); } + CloseHandle(hIpc); + } #endif } @@ -120,15 +120,15 @@ HelperServerBase::closeWritePipeSafely() writePipe->close(); #ifdef _SQUID_MSWIN_ - if (hIpc) { - if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) { - getCurrentTime(); - debugs(84, DBG_IMPORTANT, "WARNING: " << hlp->id_name << - " #" << no << " (" << hlp->cmdline->key << "," << - (long int)pid << ") didn't exit in 5 seconds"); - } - CloseHandle(hIpc); + if (hIpc) { + if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) { + getCurrentTime(); + debugs(84, DBG_IMPORTANT, "WARNING: " << hlp->id_name << + " #" << no << " (" << hlp->cmdline->key << "," << + (long int)pid << ") didn't exit in 5 seconds"); } + CloseHandle(hIpc); + } #endif } diff --git a/src/http.cc b/src/http.cc index 2c1c57529b..114b9b7190 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1395,8 +1395,7 @@ HttpStateData::processReplyBody() (void) 0; } else switch (persistentConnStatus()) { - case INCOMPLETE_MSG: - { + case INCOMPLETE_MSG: { debugs(11, 5, "processReplyBody: INCOMPLETE_MSG from " << serverConnection); /* Wait for more data or EOF condition */ AsyncCall::Pointer nil; @@ -1407,8 +1406,8 @@ HttpStateData::processReplyBody() } flags.do_next_read = 1; - } - break; + } + break; case COMPLETE_PERSISTENT_MSG: debugs(11, 5, "processReplyBody: COMPLETE_PERSISTENT_MSG from " << serverConnection); diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc index 04a6ae8704..ace6e3c0dd 100644 --- a/src/ident/Ident.cc +++ b/src/ident/Ident.cc @@ -157,10 +157,10 @@ Ident::ConnectDone(const Comm::ConnectionPointer &conn, comm_err_t status, int x AsyncCall::Pointer nil; Comm::Write(conn, &mb, nil); AsyncCall::Pointer readCall = commCbCall(5,4, "Ident::ReadReply", - CommIoCbPtrFun(Ident::ReadReply, state)); + CommIoCbPtrFun(Ident::ReadReply, state)); comm_read(conn, state->buf, IDENT_BUFSIZE, readCall); AsyncCall::Pointer timeoutCall = commCbCall(5,4, "Ident::Timeout", - CommTimeoutCbPtrFun(Ident::Timeout, state)); + CommTimeoutCbPtrFun(Ident::Timeout, state)); commSetConnTimeout(conn, Ident::TheConfig.timeout, timeoutCall); } diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h index b9f2765afc..b8df06c196 100644 --- a/src/ip/QosConfig.h +++ b/src/ip/QosConfig.h @@ -29,88 +29,88 @@ namespace Ip namespace Qos { - /** - * Function to retrieve the TOS value of the inbound packet. - * Called by FwdState::dispatch if QOS options are enabled. - * Bug 2537: This part of ZPH only applies to patched Linux kernels - * @param server Server side descriptor of connection to get TOS for - * @param clientFde Pointer to client side fde instance to set tosFromServer in - */ - void getTosFromServer(const Comm::ConnectionPointer &server, fde *clientFde); +/** +* Function to retrieve the TOS value of the inbound packet. +* Called by FwdState::dispatch if QOS options are enabled. +* Bug 2537: This part of ZPH only applies to patched Linux kernels +* @param server Server side descriptor of connection to get TOS for +* @param clientFde Pointer to client side fde instance to set tosFromServer in +*/ +void getTosFromServer(const Comm::ConnectionPointer &server, fde *clientFde); - /** - * Function to retrieve the netfilter mark value of the connection - * to the upstream server. Called by FwdState::dispatch if QOS - * options are enabled. - * @param server Server side descriptor of connection to get mark for - * @param clientFde Pointer to client side fde instance to set nfmarkFromServer in - */ - void getNfmarkFromServer(const Comm::ConnectionPointer &server, const fde *clientFde); +/** +* Function to retrieve the netfilter mark value of the connection +* to the upstream server. Called by FwdState::dispatch if QOS +* options are enabled. +* @param server Server side descriptor of connection to get mark for +* @param clientFde Pointer to client side fde instance to set nfmarkFromServer in +*/ +void getNfmarkFromServer(const Comm::ConnectionPointer &server, const fde *clientFde); #if USE_LIBNETFILTERCONNTRACK - /** - * Callback function to mark connection once it's been found. - * This function is called by the libnetfilter_conntrack - * libraries, during nfct_query in Ip::Qos::getNfmarkFromServer. - * nfct_callback_register is used to register this function. - * @param nf_conntrack_msg_type Type of conntrack message - * @param nf_conntrack Pointer to the conntrack structure - * @param clientFde Pointer to client side fde instance to set nfmarkFromServer in - */ - int getNfMarkCallback(enum nf_conntrack_msg_type type, struct nf_conntrack *ct, void *clientFde); +/** +* Callback function to mark connection once it's been found. +* This function is called by the libnetfilter_conntrack +* libraries, during nfct_query in Ip::Qos::getNfmarkFromServer. +* nfct_callback_register is used to register this function. +* @param nf_conntrack_msg_type Type of conntrack message +* @param nf_conntrack Pointer to the conntrack structure +* @param clientFde Pointer to client side fde instance to set nfmarkFromServer in +*/ +int getNfMarkCallback(enum nf_conntrack_msg_type type, struct nf_conntrack *ct, void *clientFde); #endif - /** - * Function to work out and then apply to the socket the appropriate - * TOS value to set on packets when items have not been retrieved from - * local cache. Called by clientReplyContext::sendMoreData if QOS is - * enabled for TOS. - * @param conn Descriptor of socket to set the TOS for - * @param hierCode Hier code of request - */ - int doTosLocalMiss(const Comm::ConnectionPointer &conn, const hier_code hierCode); +/** +* Function to work out and then apply to the socket the appropriate +* TOS value to set on packets when items have not been retrieved from +* local cache. Called by clientReplyContext::sendMoreData if QOS is +* enabled for TOS. +* @param conn Descriptor of socket to set the TOS for +* @param hierCode Hier code of request +*/ +int doTosLocalMiss(const Comm::ConnectionPointer &conn, const hier_code hierCode); - /** - * Function to work out and then apply to the socket the appropriate - * netfilter mark value to set on packets when items have not been - * retrieved from local cache. Called by clientReplyContext::sendMoreData - * if QOS is enabled for TOS. - * @param conn Descriptor of socket to set the mark for - * @param hierCode Hier code of request - */ - int doNfmarkLocalMiss(const Comm::ConnectionPointer &conn, const hier_code hierCode); +/** +* Function to work out and then apply to the socket the appropriate +* netfilter mark value to set on packets when items have not been +* retrieved from local cache. Called by clientReplyContext::sendMoreData +* if QOS is enabled for TOS. +* @param conn Descriptor of socket to set the mark for +* @param hierCode Hier code of request +*/ +int doNfmarkLocalMiss(const Comm::ConnectionPointer &conn, const hier_code hierCode); - /** - * Function to work out and then apply to the socket the appropriate - * TOS value to set on packets when items *have* been retrieved from - * local cache. Called by clientReplyContext::doGetMoreData if QOS is - * enabled for TOS. - * @param conn Descriptor of socket to set the TOS for - */ - int doTosLocalHit(const Comm::ConnectionPointer &conn); +/** +* Function to work out and then apply to the socket the appropriate +* TOS value to set on packets when items *have* been retrieved from +* local cache. Called by clientReplyContext::doGetMoreData if QOS is +* enabled for TOS. +* @param conn Descriptor of socket to set the TOS for +*/ +int doTosLocalHit(const Comm::ConnectionPointer &conn); - /** - * Function to work out and then apply to the socket the appropriate - * netfilter mark value to set on packets when items *have* been - * retrieved from local cache. Called by clientReplyContext::doGetMoreData - * if QOS is enabled for TOS. - * @param conn Descriptor of socket to set the mark for - */ - int doNfmarkLocalHit(const Comm::ConnectionPointer &conn); +/** +* Function to work out and then apply to the socket the appropriate +* netfilter mark value to set on packets when items *have* been +* retrieved from local cache. Called by clientReplyContext::doGetMoreData +* if QOS is enabled for TOS. +* @param conn Descriptor of socket to set the mark for +*/ +int doNfmarkLocalHit(const Comm::ConnectionPointer &conn); - /** - * Function to set the TOS value of packets. Sets the value on the socket - * which then gets copied to the packets. - * @param conn Descriptor of socket to set the TOS for - */ - _SQUID_INLINE_ int setSockTos(const Comm::ConnectionPointer &conn, tos_t tos); +/** +* Function to set the TOS value of packets. Sets the value on the socket +* which then gets copied to the packets. +* @param conn Descriptor of socket to set the TOS for +*/ +_SQUID_INLINE_ int setSockTos(const Comm::ConnectionPointer &conn, tos_t tos); - /** - * Function to set the netfilter mark value of packets. Sets the value on the - * socket which then gets copied to the packets. Called from Ip::Qos::doNfmarkLocalMiss - * @param conn Descriptor of socket to set the mark for - */ - _SQUID_INLINE_ int setSockNfmark(const Comm::ConnectionPointer &conn, nfmark_t mark); +/** +* Function to set the netfilter mark value of packets. Sets the value on the +* socket which then gets copied to the packets. Called from Ip::Qos::doNfmarkLocalMiss +* @param conn Descriptor of socket to set the mark for +*/ +_SQUID_INLINE_ int setSockNfmark(const Comm::ConnectionPointer &conn, nfmark_t mark); /** * QOS configuration class. Contains all the parameters for QOS functions as well diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc index c6948c6aa6..96c3950362 100644 --- a/src/ipc/Coordinator.cc +++ b/src/ipc/Coordinator.cc @@ -122,7 +122,7 @@ Ipc::Coordinator::handleSharedListenRequest(const SharedListenRequest& request) Listeners::const_iterator i = listeners.find(request.params); int errNo = 0; const Comm::ConnectionPointer c = (i != listeners.end()) ? - i->second : openListenSocket(request, errNo); + i->second : openListenSocket(request, errNo); debugs(54, 3, HERE << "sending shared listen " << c << " for " << request.params.addr << " to kid" << request.requestorId << diff --git a/src/ipcache.h b/src/ipcache.h index e98e4d8687..6395d3160e 100644 --- a/src/ipcache.h +++ b/src/ipcache.h @@ -1,7 +1,8 @@ #ifndef _SQUID_IPCACHE_H #define _SQUID_IPCACHE_H -namespace Ip { +namespace Ip +{ class Address; } diff --git a/src/pconn.cc b/src/pconn.cc index a5e101e7bc..63dff19f2a 100644 --- a/src/pconn.cc +++ b/src/pconn.cc @@ -144,7 +144,7 @@ IdleConnList::closeN(size_t n) parent_->noteConnectionRemoved(); } // shuffle the list N down. - for (;index < (size_t)size_; index++) { + for (; index < (size_t)size_; index++) { theList_[index - n] = theList_[index]; } // ensure the last N entries are unset @@ -186,10 +186,10 @@ IdleConnList::push(const Comm::ConnectionPointer &conn) theList_[size_++] = conn; AsyncCall::Pointer readCall = commCbCall(5,4, "IdleConnList::Read", - CommIoCbPtrFun(IdleConnList::Read, this)); + CommIoCbPtrFun(IdleConnList::Read, this)); comm_read(conn, fakeReadBuf_, sizeof(fakeReadBuf_), readCall); AsyncCall::Pointer timeoutCall = commCbCall(5,4, "IdleConnList::Read", - CommTimeoutCbPtrFun(IdleConnList::Timeout, this)); + CommTimeoutCbPtrFun(IdleConnList::Timeout, this)); commSetConnTimeout(conn, Config.Timeout.pconn, timeoutCall); } diff --git a/src/peer_select.cc b/src/peer_select.cc index 3201906395..c5e13566bf 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -253,7 +253,7 @@ peerSelectDnsResults(const ipcache_addrs *ia, const DnsLookupDetails &details, v // for TPROXY we must skip unusable addresses. if (psstate->request->flags.spoof_client_ip && !(fs->_peer && fs->_peer->options.no_tproxy) ) { - if(ia->in_addrs[n].IsIPv4() != psstate->request->client_addr.IsIPv4()) { + if (ia->in_addrs[n].IsIPv4() != psstate->request->client_addr.IsIPv4()) { // we CAN'T spoof the address on this link. find another. continue; } diff --git a/src/ssl/ErrorDetail.cc b/src/ssl/ErrorDetail.cc index e3171205a1..23233980cd 100644 --- a/src/ssl/ErrorDetail.cc +++ b/src/ssl/ErrorDetail.cc @@ -5,7 +5,7 @@ #include #endif -struct SslErrorEntry{ +struct SslErrorEntry { Ssl::ssl_error_t value; const char *name; }; diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc index 7cd8a3711e..4bfe6e5e62 100644 --- a/src/ssl/ErrorDetailManager.cc +++ b/src/ssl/ErrorDetailManager.cc @@ -17,10 +17,12 @@ namespace Ssl { /// manages error detail templates -class ErrorDetailFile : public TemplateFile{ +class ErrorDetailFile : public TemplateFile +{ public: explicit ErrorDetailFile(ErrorDetailsList::Pointer const details): TemplateFile("error-details.txt") { - buf.init(); theDetails = details; + buf.init(); + theDetails = details; } private: @@ -97,8 +99,8 @@ Ssl::ErrorDetailsList::Pointer Ssl::ErrorDetailsManager::getCachedDetails(const Cache::iterator it; it = cache.find(lang); if (it != cache.end()) { - debugs(83, 8, HERE << "Found template details in cache for language: " << lang); - return it->second; + debugs(83, 8, HERE << "Found template details in cache for language: " << lang); + return it->second; } return NULL; @@ -130,7 +132,7 @@ Ssl::ErrorDetailsManager::getErrorDetail(Ssl::ssl_error_t value, HttpRequest *re debugs(83, 8, HERE << "Creating new ErrDetailList to read from disk"); errDetails = new ErrorDetailsList(); ErrorDetailFile detailTmpl(errDetails); - if(detailTmpl.loadFor(request)) { + if (detailTmpl.loadFor(request)) { if (detailTmpl.language()) { debugs(83, 8, HERE << "Found details on disk for language " << detailTmpl.language()); errDetails->errLanguage = detailTmpl.language(); @@ -166,7 +168,8 @@ Ssl::ErrorDetailsManager::getDefaultErrorDetail(Ssl::ssl_error_t value) } // Use HttpHeaders parser to parse error-details.txt files -class DetailEntryParser: public HttpHeader { +class DetailEntryParser: public HttpHeader +{ public: DetailEntryParser():HttpHeader(hoErrorDetail) {} }; @@ -194,8 +197,8 @@ Ssl::ErrorDetailFile::parse(const char *buffer, int len, bool eof) //ignore spaces, new lines and comment lines (starting with #) at the beggining const char *s; for (s = buf.content(); (*s == '\n' || *s == ' ' || *s == '\t' || *s == '#') && s < e; s++) { - if(*s == '#') - while(sclient.conn, Config.Timeout.lifetime, timeoutCall); peerSelect(&(tunnelState->serverDestinations), request, @@ -676,11 +676,11 @@ tunnelRelayConnectRequest(const Comm::ConnectionPointer &srv, void *data) mb.append("\r\n", 2); AsyncCall::Pointer writeCall = commCbCall(5,5, "tunnelConnectedWriteDone", - CommIoCbPtrFun(tunnelConnectedWriteDone, tunnelState)); + CommIoCbPtrFun(tunnelConnectedWriteDone, tunnelState)); Comm::Write(srv, &mb, writeCall); AsyncCall::Pointer timeoutCall = commCbCall(5, 4, "tunnelTimeout", - CommTimeoutCbPtrFun(tunnelTimeout, tunnelState)); + CommTimeoutCbPtrFun(tunnelTimeout, tunnelState)); commSetConnTimeout(srv, Config.Timeout.read, timeoutCall); } diff --git a/src/whois.cc b/src/whois.cc index 56ed18c5e5..82dbc0f646 100644 --- a/src/whois.cc +++ b/src/whois.cc @@ -102,13 +102,13 @@ whoisStart(FwdState * fwd) snprintf(buf, l, SQUIDSTRINGPH"\r\n", SQUIDSTRINGPRINT(str_print)); AsyncCall::Pointer writeCall = commCbCall(5,5, "whoisWriteComplete", - CommIoCbPtrFun(whoisWriteComplete, p)); + CommIoCbPtrFun(whoisWriteComplete, p)); Comm::Write(fwd->serverConnection(), buf, strlen(buf), writeCall, NULL); AsyncCall::Pointer readCall = commCbCall(5,4, "whoisReadReply", - CommIoCbPtrFun(whoisReadReply, p)); + CommIoCbPtrFun(whoisReadReply, p)); comm_read(fwd->serverConnection(), p->buf, BUFSIZ, readCall); AsyncCall::Pointer timeoutCall = commCbCall(5, 4, "whoisTimeout", - CommTimeoutCbPtrFun(whoisTimeout, p)); + CommTimeoutCbPtrFun(whoisTimeout, p)); commSetConnTimeout(fwd->serverConnection(), Config.Timeout.read, timeoutCall); }