From: SquidAdm Date: Wed, 5 Aug 2020 07:55:54 +0000 (+0000) Subject: Source Format Enforcement X-Git-Tag: SQUID_5_0_4~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83c83b4ebe3e039ccfff08e93efb88c7e18d5540;p=thirdparty%2Fsquid.git Source Format Enforcement --- diff --git a/doc/manuals/language.am b/doc/manuals/language.am index 7670c88380..f03c4cf71b 100644 --- a/doc/manuals/language.am +++ b/doc/manuals/language.am @@ -18,4 +18,4 @@ TRANSLATE_LANGUAGES = \ oc.lang \ pt.lang \ ro.lang \ - ru.lang + ru.lang diff --git a/errors/language.am b/errors/language.am index 12b1b2b3b4..802b0f4248 100644 --- a/errors/language.am +++ b/errors/language.am @@ -51,4 +51,4 @@ TRANSLATE_LANGUAGES = \ uz.lang \ vi.lang \ zh-hans.lang \ - zh-hant.lang + zh-hant.lang diff --git a/errors/template.am b/errors/template.am index 6c12781e6f..715c65aa22 100644 --- a/errors/template.am +++ b/errors/template.am @@ -48,4 +48,4 @@ ERROR_TEMPLATES = \ templates/ERR_UNSUP_REQ \ templates/ERR_URN_RESOLVE \ templates/ERR_WRITE_ERROR \ - templates/ERR_ZERO_SIZE_OBJECT + templates/ERR_ZERO_SIZE_OBJECT diff --git a/src/FwdState.cc b/src/FwdState.cc index a992dc5477..fdbb658654 100644 --- a/src/FwdState.cc +++ b/src/FwdState.cc @@ -835,8 +835,8 @@ FwdState::noteConnection(HappyConnOpener::Answer &answer) !peer->options.originserver && // the "through a proxy" part !peer->secure.encryptTransport) // the "exclude HTTPS proxies" part return advanceDestination("establish tunnel through proxy", answer.conn, [this,&answer] { - establishTunnelThruProxy(answer.conn); - }); + establishTunnelThruProxy(answer.conn); + }); } secureConnectionToPeerIfNeeded(answer.conn); diff --git a/src/MemStore.cc b/src/MemStore.cc index 7c77002fda..f8e49d2170 100644 --- a/src/MemStore.cc +++ b/src/MemStore.cc @@ -1011,7 +1011,7 @@ MemStoreRr::create() Ipc::Mem::PageStack::Config spaceConfig; spaceConfig.poolId = Ipc::Mem::PageStack::IdForMemStoreSpace(), - spaceConfig.pageSize = 0; // the pages are stored in Ipc::Mem::Pages + spaceConfig.pageSize = 0; // the pages are stored in Ipc::Mem::Pages spaceConfig.capacity = entryLimit; spaceConfig.createFull = true; // all pages are initially available Must(!spaceOwner); diff --git a/src/ResolvedPeers.cc b/src/ResolvedPeers.cc index d8f00cb443..32423b9421 100644 --- a/src/ResolvedPeers.cc +++ b/src/ResolvedPeers.cc @@ -76,8 +76,8 @@ ResolvedPeers::findPrime(const Comm::Connection ¤tPeer) { const auto path = start(); const auto foundNextOrSpare = path != paths_.end() && - (currentPeer.getPeer() != path->connection->getPeer() || // next peer - ConnectionFamily(currentPeer) != ConnectionFamily(*path->connection)); + (currentPeer.getPeer() != path->connection->getPeer() || // next peer + ConnectionFamily(currentPeer) != ConnectionFamily(*path->connection)); return makeFinding(path, foundNextOrSpare); } @@ -98,7 +98,7 @@ ResolvedPeers::findSpare(const Comm::Connection ¤tPeer) return false; }); const auto foundNext = path != paths_.end() && - primePeer != path->connection->getPeer(); + primePeer != path->connection->getPeer(); return makeFinding(path, foundNext); } @@ -108,7 +108,7 @@ ResolvedPeers::findPeer(const Comm::Connection ¤tPeer) { const auto path = start(); const auto foundNext = path != paths_.end() && - currentPeer.getPeer() != path->connection->getPeer(); + currentPeer.getPeer() != path->connection->getPeer(); return makeFinding(path, foundNext); } diff --git a/src/comm.cc b/src/comm.cc index 891e6a5825..3ffc67a98c 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -1297,8 +1297,8 @@ ClientInfo::writeOrDequeue() const auto ccb = COMMIO_FD_WRITECB(head); // check that the head descriptor is still relevant if (headFde.clientInfo == this && - quotaPeekReserv() == ccb->quotaQueueReserv && - !headFde.closing()) { + quotaPeekReserv() == ccb->quotaQueueReserv && + !headFde.closing()) { // wait for the head descriptor to become ready for writing Comm::SetSelect(head, COMM_SELECT_WRITE, Comm::HandleWrite, ccb, 0); @@ -1678,7 +1678,7 @@ commHalfClosedCheck(void *) if (!fd_table[c->fd].halfClosedReader) { // not reading already CallBack(fd_table[c->fd].codeContext, [&c] { AsyncCall::Pointer call = commCbCall(5,4, "commHalfClosedReader", - CommIoCbPtrFun(&commHalfClosedReader, nullptr)); + CommIoCbPtrFun(&commHalfClosedReader, nullptr)); Comm::Read(c, call); fd_table[c->fd].halfClosedReader = call; }); diff --git a/src/mem/PoolingAllocator.h b/src/mem/PoolingAllocator.h index ff5de1094c..355aa03f1d 100644 --- a/src/mem/PoolingAllocator.h +++ b/src/mem/PoolingAllocator.h @@ -35,7 +35,7 @@ public: template struct rebind { - typedef PoolingAllocator other; + typedef PoolingAllocator other; }; template void destroy(OtherValue *p) { p->~OtherValue(); } diff --git a/src/peer_select.cc b/src/peer_select.cc index 49a835ec13..d70c0beeec 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -171,7 +171,7 @@ PeerSelectorPingMonitor::noteWaitOver() CallBack(selector->al, [selector,this] { selector->ping.monitorRegistration = npos(); AsyncCall::Pointer callback = asyncCall(44, 4, "PeerSelector::HandlePingTimeout", - cbdataDialer(PeerSelector::HandlePingTimeout, selector)); + cbdataDialer(PeerSelector::HandlePingTimeout, selector)); ScheduleCallHere(callback); }); selectors.erase(selectors.begin()); diff --git a/src/ssl/bio.cc b/src/ssl/bio.cc index 15cc9eecd0..10b8e838b0 100644 --- a/src/ssl/bio.cc +++ b/src/ssl/bio.cc @@ -559,7 +559,7 @@ bool Ssl::ServerBio::encryptedCertificates() const { return parser_.details->tlsSupportedVersion && - Security::Tls1p3orLater(parser_.details->tlsSupportedVersion); + Security::Tls1p3orLater(parser_.details->tlsSupportedVersion); } /// initializes BIO table after allocation diff --git a/src/tests/Stub.am b/src/tests/Stub.am index 6a70bd1ca8..ecfdd6d6c3 100644 --- a/src/tests/Stub.am +++ b/src/tests/Stub.am @@ -6,87 +6,87 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -STUB_SOURCE= tests/STUB.h \ - tests/stub_access_log.cc \ - tests/stub_acl.cc \ - tests/stub_cache_cf.cc \ - tests/stub_CacheDigest.cc \ - tests/stub_cache_manager.cc \ - tests/stub_carp.cc \ - tests/stub_cbdata.cc \ - tests/stub_client_db.cc \ - tests/stub_client_side.cc \ - tests/stub_client_side_request.cc \ - tests/stub_CollapsedForwarding.cc \ - tests/stub_comm.cc \ - tests/stub_CommIO.cc \ - tests/stub_debug.cc \ - tests/stub_DelayId.cc \ - tests/stub_errorpage.cc \ - tests/stub_ETag.cc \ - tests/stub_event.cc \ - tests/stub_EventLoop.cc \ - tests/stub_external_acl.cc \ - tests/stub_fatal.cc \ - tests/stub_fd.cc \ - tests/stub_gopher.cc \ - tests/stub_helper.cc \ - tests/stub_HelperChildConfig.cc \ - tests/stub_http.cc \ - tests/stub_HttpControlMsg.cc \ - tests/stub_HttpHeader.cc \ - tests/stub_HttpReply.cc \ - tests/stub_HttpRequest.cc \ - tests/stub_HttpUpgradeProtocolAccess.cc \ - tests/stub_icp.cc \ - tests/stub_internal.cc \ - tests/stub_ipcache.cc \ - tests/stub_ipc.cc \ - tests/stub_ipc_Forwarder.cc \ - tests/stub_ipc_TypedMsgHdr.cc \ - tests/stub_libanyp.cc \ - tests/stub_libauth_acls.cc \ - tests/stub_libauth.cc \ - tests/stub_libcomm.cc \ - tests/stub_libdiskio.cc \ - tests/stub_libeui.cc \ - tests/stub_libformat.cc \ - tests/stub_libhttp.cc \ - tests/stub_libicmp.cc \ - tests/stub_libip.cc \ - tests/stub_liblog.cc \ - tests/stub_libmem.cc \ - tests/stub_libmgr.cc \ - tests/stub_libsecurity.cc \ - tests/stub_libsslsquid.cc \ - tests/stub_libstore.cc \ - tests/stub_main_cc.cc \ - tests/stub_MemBuf.cc \ - tests/stub_mem_node.cc \ - tests/stub_MemObject.cc \ - tests/stub_MemStore.cc \ - tests/stub_mime.cc \ - tests/stub_neighbors.cc \ - tests/stub_pconn.cc \ - tests/stub_Port.cc \ - tests/stub_redirect.cc \ - tests/stub_SBuf.cc \ - tests/stub_SBufDetailedStats.cc \ - tests/stub_stat.cc \ - tests/stub_StatHist.cc \ - tests/stub_stmem.cc \ - tests/stub_store.cc \ - tests/stub_store_client.cc \ - tests/stub_store_digest.cc \ - tests/stub_StoreMeta.cc \ - tests/stub_store_rebuild.cc \ - tests/stub_store_stats.cc \ - tests/stub_store_swapout.cc \ - tests/stub_SwapDir.cc \ - tests/stub_time.cc \ - tests/stub_tools.cc \ - tests/stub_tunnel.cc \ - tests/stub_UdsOp.cc \ - tests/stub_wccp2.cc \ - tests/stub_whois.cc \ - tests/stub_wordlist.cc +STUB_SOURCE = \ + tests/stub_access_log.cc \ + tests/stub_acl.cc \ + tests/stub_cache_cf.cc \ + tests/stub_CacheDigest.cc \ + tests/stub_cache_manager.cc \ + tests/stub_carp.cc \ + tests/stub_cbdata.cc \ + tests/stub_client_db.cc \ + tests/stub_client_side.cc \ + tests/stub_client_side_request.cc \ + tests/stub_CollapsedForwarding.cc \ + tests/stub_comm.cc \ + tests/stub_CommIO.cc \ + tests/stub_debug.cc \ + tests/stub_DelayId.cc \ + tests/stub_errorpage.cc \ + tests/stub_ETag.cc \ + tests/stub_event.cc \ + tests/stub_EventLoop.cc \ + tests/stub_external_acl.cc \ + tests/stub_fatal.cc \ + tests/stub_fd.cc \ + tests/stub_gopher.cc \ + tests/stub_helper.cc \ + tests/stub_HelperChildConfig.cc \ + tests/stub_http.cc \ + tests/stub_HttpControlMsg.cc \ + tests/stub_HttpHeader.cc \ + tests/stub_HttpReply.cc \ + tests/stub_HttpRequest.cc \ + tests/stub_HttpUpgradeProtocolAccess.cc \ + tests/stub_icp.cc \ + tests/stub_internal.cc \ + tests/stub_ipcache.cc \ + tests/stub_ipc.cc \ + tests/stub_ipc_Forwarder.cc \ + tests/stub_ipc_TypedMsgHdr.cc \ + tests/stub_libanyp.cc \ + tests/stub_libauth_acls.cc \ + tests/stub_libauth.cc \ + tests/stub_libcomm.cc \ + tests/stub_libdiskio.cc \ + tests/stub_libeui.cc \ + tests/stub_libformat.cc \ + tests/stub_libhttp.cc \ + tests/stub_libicmp.cc \ + tests/stub_libip.cc \ + tests/stub_liblog.cc \ + tests/stub_libmem.cc \ + tests/stub_libmgr.cc \ + tests/stub_libsecurity.cc \ + tests/stub_libsslsquid.cc \ + tests/stub_libstore.cc \ + tests/stub_main_cc.cc \ + tests/stub_MemBuf.cc \ + tests/stub_mem_node.cc \ + tests/stub_MemObject.cc \ + tests/stub_MemStore.cc \ + tests/stub_mime.cc \ + tests/stub_neighbors.cc \ + tests/stub_pconn.cc \ + tests/stub_Port.cc \ + tests/stub_redirect.cc \ + tests/stub_SBuf.cc \ + tests/stub_SBufDetailedStats.cc \ + tests/stub_stat.cc \ + tests/stub_StatHist.cc \ + tests/stub_stmem.cc \ + tests/stub_store.cc \ + tests/stub_store_client.cc \ + tests/stub_store_digest.cc \ + tests/stub_StoreMeta.cc \ + tests/stub_store_rebuild.cc \ + tests/stub_store_stats.cc \ + tests/stub_store_swapout.cc \ + tests/stub_SwapDir.cc \ + tests/stub_time.cc \ + tests/stub_tools.cc \ + tests/stub_tunnel.cc \ + tests/stub_UdsOp.cc \ + tests/stub_wccp2.cc \ + tests/stub_whois.cc \ + tests/stub_wordlist.cc diff --git a/src/tests/testUriScheme.cc b/src/tests/testUriScheme.cc index b58b6505b2..7bf248facb 100644 --- a/src/tests/testUriScheme.cc +++ b/src/tests/testUriScheme.cc @@ -161,3 +161,4 @@ testUriScheme::setUp() Mem::Init(); AnyP::UriScheme::Init(); } +