From: squidadm Date: Fri, 6 Nov 2020 15:18:39 +0000 (+0000) Subject: Source Format Enforcement (#745) X-Git-Tag: 4.15-20210522-snapshot~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70ac5b29a795ad07555f7148045cce88b5e4b937;p=thirdparty%2Fsquid.git Source Format Enforcement (#745) --- diff --git a/include/version.h b/include/version.h index a40c17c8fd..7d5c08b43b 100644 --- a/include/version.h +++ b/include/version.h @@ -26,3 +26,4 @@ #endif #endif /* SQUID_VERSION_H */ + diff --git a/src/CachePeer.h b/src/CachePeer.h index b86b18f962..288a07af62 100644 --- a/src/CachePeer.h +++ b/src/CachePeer.h @@ -196,3 +196,4 @@ public: }; #endif /* SQUID_CACHEPEER_H_ */ + diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc index 95f1a96e9f..3a65b47a78 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.cc +++ b/src/DiskIO/IpcIo/IpcIoFile.cc @@ -678,14 +678,14 @@ IpcIoMsg::stat(std::ostream &os) timeval elapsedTime; tvSub(elapsedTime, start, current_time); os << "id: " << requestId << - ", offset: " << offset << - ", size: " << len << - ", workerPid: " << workerPid << - ", page: " << page << - ", command: " << command << - ", start: " << start << - ", elapsed: " << elapsedTime << - ", errno: " << xerrno; + ", offset: " << offset << + ", size: " << len << + ", workerPid: " << workerPid << + ", page: " << page << + ", command: " << command << + ", start: " << start << + ", elapsed: " << elapsedTime << + ", errno: " << xerrno; } /* IpcIoPendingRequest */ diff --git a/src/FwdState.cc b/src/FwdState.cc index c9fa449bcf..5be266720f 100644 --- a/src/FwdState.cc +++ b/src/FwdState.cc @@ -852,8 +852,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/HttpHdrSc.cc b/src/HttpHdrSc.cc index 9baf1a31b2..8d62b6eb25 100644 --- a/src/HttpHdrSc.cc +++ b/src/HttpHdrSc.cc @@ -322,3 +322,4 @@ HttpHdrSc::getMergedTarget(const char *ourtarget) return NULL; } + diff --git a/src/Makefile.am b/src/Makefile.am index 1a63903df5..f6d4c568b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1503,11 +1503,11 @@ tests_testStore_SOURCES = \ StatCounters.h \ StatHist.cc \ StatHist.h \ - StoreFileSystem.cc \ tests/testStore.cc \ tests/testStore.h \ tests/testStoreController.cc \ tests/testStoreController.h \ + StoreFileSystem.cc \ tests/testStoreHashIndex.cc \ tests/testStoreHashIndex.h \ StoreIOState.cc \ @@ -1897,6 +1897,7 @@ tests_test_http_range_SOURCES = \ HttpRequest.cc \ tests/stub_HttpUpgradeProtocolAccess.cc \ IoStats.h \ + tests/stub_IpcIoFile.cc \ LogTags.cc \ MasterXaction.cc \ MasterXaction.h \ @@ -1952,7 +1953,6 @@ tests_test_http_range_SOURCES = \ event.cc \ tests/stub_external_acl.cc \ tests/stub_fatal.cc \ - tests/stub_IpcIoFile.cc \ fatal.h \ fd.cc \ fd.h \ @@ -2287,6 +2287,7 @@ tests_testHttpRequest_SOURCES = \ tests/testHttpRequestMethod.h \ tests/stub_HttpUpgradeProtocolAccess.cc \ IoStats.h \ + tests/stub_IpcIoFile.cc \ LogTags.cc \ MasterXaction.cc \ MasterXaction.h \ @@ -2370,7 +2371,6 @@ tests_testHttpRequest_SOURCES = \ tests/stub_libsecurity.cc \ tests/stub_libstore.cc \ tests/stub_main_cc.cc \ - tests/stub_IpcIoFile.cc \ mem_node.cc \ mime.cc \ mime.h \ @@ -2591,6 +2591,7 @@ tests_testCacheManager_SOURCES = \ HttpRequest.cc \ tests/stub_HttpUpgradeProtocolAccess.cc \ IoStats.h \ + tests/stub_IpcIoFile.cc \ LogTags.cc \ MasterXaction.cc \ MasterXaction.h \ @@ -2673,7 +2674,6 @@ tests_testCacheManager_SOURCES = \ tests/stub_libsecurity.cc \ tests/stub_libstore.cc \ tests/stub_main_cc.cc \ - tests/stub_IpcIoFile.cc \ mem_node.cc \ mime.cc \ mime.h \ @@ -2912,6 +2912,7 @@ tests_testEvent_SOURCES = \ HttpRequest.cc \ tests/stub_HttpUpgradeProtocolAccess.cc \ IoStats.h \ + tests/stub_IpcIoFile.cc \ LogTags.cc \ MasterXaction.cc \ MasterXaction.h \ @@ -2996,7 +2997,6 @@ tests_testEvent_SOURCES = \ tests/stub_libsecurity.cc \ tests/stub_libstore.cc \ tests/stub_main_cc.cc \ - tests/stub_IpcIoFile.cc \ mem_node.cc \ mime.cc \ mime.h \ diff --git a/src/MemStore.cc b/src/MemStore.cc index 7c77002fda..cfff293185 100644 --- a/src/MemStore.cc +++ b/src/MemStore.cc @@ -1010,7 +1010,7 @@ MemStoreRr::create() assert(entryLimit > 0); Ipc::Mem::PageStack::Config spaceConfig; - spaceConfig.poolId = Ipc::Mem::PageStack::IdForMemStoreSpace(), + spaceConfig.poolId = Ipc::Mem::PageStack::IdForMemStoreSpace(); spaceConfig.pageSize = 0; // the pages are stored in Ipc::Mem::Pages spaceConfig.capacity = entryLimit; spaceConfig.createFull = true; // all pages are initially available diff --git a/src/ResolvedPeers.cc b/src/ResolvedPeers.cc index 6b762e0e90..a7accc36e5 100644 --- a/src/ResolvedPeers.cc +++ b/src/ResolvedPeers.cc @@ -71,8 +71,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); } @@ -93,7 +93,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); } @@ -103,7 +103,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); } @@ -239,3 +239,4 @@ PeerConnectionPointer::print(std::ostream &os) const if (position_ != npos) os << " @" << position_; } + diff --git a/src/SquidMath.h b/src/SquidMath.h index 480d7b931b..c00c61bd06 100644 --- a/src/SquidMath.h +++ b/src/SquidMath.h @@ -40,10 +40,10 @@ using EnableIfType = typename std::enable_if::type; /// reduces code duplication in Sum() declarations below template using AllUnsigned = typename std::conditional< - std::is_unsigned::value && std::is_unsigned::value, - std::true_type, - std::false_type - >::type; + std::is_unsigned::value && std::is_unsigned::value, + std::true_type, + std::false_type + >::type; /// \returns a non-overflowing sum of the two unsigned arguments (or nothing) template ::value, int> = 0> @@ -72,8 +72,8 @@ Sum(const T a, const U b) { // tests below avoid undefined behavior of signed under/overflows return b >= 0 ? - ((a > std::numeric_limits::max() - b) ? Optional() : Optional(a + b)): - ((a < std::numeric_limits::min() - b) ? Optional() : Optional(a + b)); + ((a > std::numeric_limits::max() - b) ? Optional() : Optional(a + b)): + ((a < std::numeric_limits::min() - b) ? Optional() : Optional(a + b)); } /// \returns a non-overflowing sum of the arguments (or nothing) diff --git a/src/base/ClpMap.h b/src/base/ClpMap.h index 60767455a3..c8bdeb8204 100644 --- a/src/base/ClpMap.h +++ b/src/base/ClpMap.h @@ -194,12 +194,12 @@ ClpMap::MemoryCountedFor(const Key &k, const Value &v) // approximate calculation (e.g., containers store wrappers not value_types) return Sum( - keySz, - // storage - sizeof(typename Entries::value_type), - MemoryUsedBy(v), - // index - sizeof(typename Index::value_type)); + keySz, + // storage + sizeof(typename Entries::value_type), + MemoryUsedBy(v), + // index + sizeof(typename Index::value_type)); } template @@ -275,10 +275,11 @@ ClpMap::trim(const uint64_t wantSpace) template ClpMap::Entry::Entry(const Key &aKey, const Value &v, const Ttl ttl) : - key(aKey), - value(v), - expires(Sum(squid_curtime, ttl).value_or(std::numeric_limits::max())) + key(aKey), + value(v), + expires(Sum(squid_curtime, ttl).value_or(std::numeric_limits::max())) { } #endif /* SQUID__SRC_BASE_CLPMAP_H */ + diff --git a/src/base/Optional.h b/src/base/Optional.h index f7c1e5834c..aede04bde6 100644 --- a/src/base/Optional.h +++ b/src/base/Optional.h @@ -56,3 +56,4 @@ private: }; #endif /* SQUID__SRC_BASE_OPTIONAL_H */ + diff --git a/src/comm.cc b/src/comm.cc index 086d339140..b0404d127f 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/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc index 34691db595..2d41da3d0a 100644 --- a/src/fs/rock/RockRebuild.cc +++ b/src/fs/rock/RockRebuild.cc @@ -261,7 +261,7 @@ bool Rock::Rebuild::Stats::completed(const SwapDir &sd) const { return DoneLoading(counts.scancount, sd.slotLimitActual()) && - DoneValidating(counts.validations, sd.slotLimitActual(), sd.entryLimitActual()); + DoneValidating(counts.validations, sd.slotLimitActual(), sd.entryLimitActual()); } /* Rebuild */ @@ -343,7 +343,7 @@ Rock::Rebuild::start() " from " << sd->filePath); } else { debugs(47, DBG_IMPORTANT, "Resuming indexing cache_dir #" << sd->index << - " from " << sd->filePath << ':' << progressDescription()); + " from " << sd->filePath << ':' << progressDescription()); } fd = file_open(sd->filePath, O_RDONLY | O_BINARY); diff --git a/src/helper.h b/src/helper.h index a1f72d8ad6..599cc1120c 100644 --- a/src/helper.h +++ b/src/helper.h @@ -316,3 +316,4 @@ void helperShutdown(helper * hlp); void helperStatefulShutdown(statefulhelper * hlp); #endif /* SQUID_HELPER_H */ + diff --git a/src/ipc/Queue.cc b/src/ipc/Queue.cc index 6184f85de9..7e9d3ab725 100644 --- a/src/ipc/Queue.cc +++ b/src/ipc/Queue.cc @@ -102,9 +102,9 @@ void Ipc::OneToOneUniQueue::statOpen(std::ostream &os, const char *inLabel, const char *outLabel, const uint32_t count) const { os << "{ size: " << count << - ", capacity: " << theCapacity << - ", " << inLabel << ": " << theIn << - ", " << outLabel << ": " << theOut; + ", capacity: " << theCapacity << + ", " << inLabel << ": " << theIn << + ", " << outLabel << ": " << theOut; } /// end state reporting started by statOpen() diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc index 442dc53e05..8679a096cf 100644 --- a/src/log/ModDaemon.cc +++ b/src/log/ModDaemon.cc @@ -301,8 +301,8 @@ logfile_mod_daemon_writeline(Logfile * lf, const char *buf, size_t len) /* Are we eol? If so, prefix with our logfile command byte */ if (ll->eol == 1) { - logfile_mod_daemon_append(lf, "L", 1); - ll->eol = 0; + logfile_mod_daemon_append(lf, "L", 1); + ll->eol = 0; } /* Append this data to the end buffer; create a new one if needed */ diff --git a/src/mem/PoolingAllocator.h b/src/mem/PoolingAllocator.h index e1f236b284..42d5452c94 100644 --- a/src/mem/PoolingAllocator.h +++ b/src/mem/PoolingAllocator.h @@ -36,7 +36,7 @@ public: template struct rebind { - typedef PoolingAllocator other; + typedef PoolingAllocator other; }; template void construct(U *p, Args && ... args) { new((void *)p) U(std::forward(args)...); } diff --git a/src/peer_select.cc b/src/peer_select.cc index 1645f0fa19..2bdfa23882 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/ssl/context_storage.cc b/src/ssl/context_storage.cc index 4637b57b33..57784c57bf 100644 --- a/src/ssl/context_storage.cc +++ b/src/ssl/context_storage.cc @@ -45,7 +45,7 @@ void Ssl::CertificateStorageAction::dump (StoreEntry *sentry) stream << i->first << delimiter; LocalContextStorage & ssl_store_policy(*(i->second)); const auto memoryPerEntry = ssl_store_policy.entries() ? - ssl_store_policy.memoryUsed() / ssl_store_policy.entries() : 0; + ssl_store_policy.memoryUsed() / ssl_store_policy.entries() : 0; stream << ssl_store_policy.memLimit() / 1024 << delimiter; stream << ssl_store_policy.entries() << delimiter; stream << memoryPerEntry / 1024 << delimiter; diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc index 70721a489c..07213ec4dc 100644 --- a/src/ssl/helper.cc +++ b/src/ssl/helper.cc @@ -13,10 +13,10 @@ #include "fs_io.h" #include "helper/Reply.h" #include "Parsing.h" +#include "sbuf/Stream.h" #include "SquidConfig.h" #include "SquidString.h" #include "SquidTime.h" -#include "sbuf/Stream.h" #include "ssl/cert_validate_message.h" #include "ssl/Config.h" #include "ssl/helper.h" @@ -207,8 +207,8 @@ void Ssl::CertValidationHelper::Init() ttl = xatoi(token + 4); if (ttl < 0) { throw TextException(ToSBuf("Negative TTL in sslcrtvalidator_program ", Ssl::TheConfig.ssl_crt_validator, - Debug::Extra, "For unlimited TTL, use ttl=infinity"), - Here()); + Debug::Extra, "For unlimited TTL, use ttl=infinity"), + Here()); } continue; } else if (strncmp(token, "cache=", 6) == 0) { diff --git a/src/store.cc b/src/store.cc index 2a72a267e5..7219bc34f8 100644 --- a/src/store.cc +++ b/src/store.cc @@ -134,10 +134,10 @@ StatQueues(StoreEntry *e) assert(e); PackableStream stream(*e); CollapsedForwarding::StatQueue(stream); - #if HAVE_DISKIO_MODULE_IPCIO +#if HAVE_DISKIO_MODULE_IPCIO stream << "\n"; IpcIoFile::StatQueue(stream); - #endif +#endif stream.flush(); } diff --git a/src/store/Disks.cc b/src/store/Disks.cc index 5aebd0ad91..be683b01bf 100644 --- a/src/store/Disks.cc +++ b/src/store/Disks.cc @@ -19,8 +19,8 @@ #include "Store.h" #include "store/Disk.h" #include "store/Disks.h" -#include "StoreFileSystem.h" #include "store_rebuild.h" +#include "StoreFileSystem.h" #include "swap_log_op.h" #include "tools.h" #include "util.h" // for tvSubDsec() which should be in SquidTime.h @@ -468,12 +468,12 @@ Store::Disks::Parse(DiskConfig &swap) void Store::Disks::Dump(const DiskConfig &swap, StoreEntry &entry, const char *name) { - for (int i = 0; i < swap.n_configured; ++i) { - const auto &disk = Dir(i); - storeAppendPrintf(&entry, "%s %s %s", name, disk.type(), disk.path); - disk.dump(entry); - storeAppendPrintf(&entry, "\n"); - } + for (int i = 0; i < swap.n_configured; ++i) { + const auto &disk = Dir(i); + storeAppendPrintf(&entry, "%s %s %s", name, disk.type(), disk.path); + disk.dump(entry); + storeAppendPrintf(&entry, "\n"); + } } int64_t diff --git a/src/store/Disks.h b/src/store/Disks.h index 76c2cdce54..08fe8e4f10 100644 --- a/src/store/Disks.h +++ b/src/store/Disks.h @@ -79,7 +79,6 @@ void storeDirCloseSwapLogs(void); void allocate_new_swapdir(Store::DiskConfig &swap); void free_cachedir(Store::DiskConfig *swap); - /* Globals that should be moved to some Store::UFS-specific logging module */ void storeDirSwapLog(const StoreEntry *e, int op); diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index 2f1e40ed5e..1a2bb49fdc 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -240,7 +240,7 @@ Progress::print(std::ostream &os) const const auto savedPrecision = os.precision(2); const auto percent = 100.0 * completed / goal; os << percent << "% (" << completed << " out of " << goal << ")"; - (void)os.precision(savedPrecision); + (void)os.precision(savedPrecision); } else if (!completed && !goal) { os << "nothing to do"; } else { diff --git a/src/tests/Stub.am b/src/tests/Stub.am index c2ad629595..ba710aad3a 100644 --- a/src/tests/Stub.am +++ b/src/tests/Stub.am @@ -6,87 +6,88 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -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_CachePeer.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_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_CachePeer.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_IpcIoFile.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_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/stub_CachePeer.cc b/src/tests/stub_CachePeer.cc index bd351dd3ee..4d5fff85d8 100644 --- a/src/tests/stub_CachePeer.cc +++ b/src/tests/stub_CachePeer.cc @@ -14,3 +14,4 @@ #include "CachePeer.h" time_t CachePeer::connectTimeout() const STUB_RETVAL(0) + 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(); } + diff --git a/tools/Makefile.am b/tools/Makefile.am index d013f0ccbd..7820e89095 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -80,10 +80,10 @@ cachemgr__CGIEXT__SOURCES = \ time.cc nodist_cachemgr__CGIEXT__SOURCES = \ - tests/STUB.h \ tests/stub_cbdata.cc \ tests/stub_debug.cc \ - tests/stub_libmem.cc + tests/stub_libmem.cc \ + tests/STUB.h cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS)