Source Format Enforcement (#745)

diff --git a/include/version.h b/include/version.h
index a40c17c8fd2410b9b6a3260a218157e0dc0ce9ca..7d5c08b43b37515ab5704ccc51b4fb8f3e0c0ceb 100644 (file)
--- 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 b86b18f962122aef373cf7a73edb161a17fd6eae..288a07af625e6d8a31c77b24c8b27359e5f7bd6f 100644 (file)
--- 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 95f1a96e9f48c6ef345abb4f28e84a65386ca21b..3a65b47a784ca241ef2c923c2021fb173773b6f6 100644 (file)
--- 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 c9fa449bcfe1b4ea5490cb556a550d74f3d49594..5be266720f2ff29787b1e2007edbca1ae36e7ee6 100644 (file)
--- 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 9baf1a31b2df46c871424bacc9f84a967fa2ea44..8d62b6eb25a569b1f46f5d34a4cb500640676a65 100644 (file)
--- 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 1a63903df573c64ad61e8136da2e5fa453281f7b..f6d4c568b8ed73127b9b6249ba398ab8de25cb72 100644 (file)
--- 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 7c77002fda420456818a70f27de889ac598bf9c9..cfff29318539cbc4e9513487c3658b2017a343fb 100644 (file)
--- 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 6b762e0e9092dfd1caabad7fd01199ccc81c8e03..a7accc36e5016cf0e13f079215eff7f94781382e 100644 (file)
--- a/src/ResolvedPeers.cc
+++ b/src/ResolvedPeers.cc
@@ -71,8 +71,8 @@ ResolvedPeers::findPrime(const Comm::Connection &currentPeer)
 {
     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 &currentPeer)
         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 &currentPeer)
 {
     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 480d7b931bb19fd3d46e22191071c2ba71069cda..c00c61bd06827fe31172f1895109776e3670d73f 100644 (file)
--- a/src/SquidMath.h
+++ b/src/SquidMath.h
@@ -40,10 +40,10 @@ using EnableIfType = typename std::enable_if<B,T>::type;
 /// reduces code duplication in Sum() declarations below
 template <typename T, typename U>
 using AllUnsigned = typename std::conditional<
-    std::is_unsigned<T>::value && std::is_unsigned<U>::value,
-    std::true_type,
-    std::false_type
-    >::type;
+                    std::is_unsigned<T>::value && std::is_unsigned<U>::value,
+                    std::true_type,
+                    std::false_type
+                    >::type;
 
 /// \returns a non-overflowing sum of the two unsigned arguments (or nothing)
 template <typename T, typename U, EnableIfType<AllUnsigned<T,U>::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<U>::max() - b) ? Optional<T>() : Optional<T>(a + b)):
-        ((a < std::numeric_limits<U>::min() - b) ? Optional<T>() : Optional<T>(a + b));
+           ((a > std::numeric_limits<U>::max() - b) ? Optional<T>() : Optional<T>(a + b)):
+           ((a < std::numeric_limits<U>::min() - b) ? Optional<T>() : Optional<T>(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 60767455a30ddc5f74de0e2374db3a525a67e89c..c8bdeb8204da0614a13113d03ab4700ae206b95d 100644 (file)
--- a/src/base/ClpMap.h
+++ b/src/base/ClpMap.h
@@ -194,12 +194,12 @@ ClpMap<Key, Value, MemoryUsedBy>::MemoryCountedFor(const Key &k, const Value &v)
 
     // approximate calculation (e.g., containers store wrappers not value_types)
     return Sum<uint64_t>(
-        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 <class Key, class Value, uint64_t MemoryUsedBy(const Value &)>
@@ -275,10 +275,11 @@ ClpMap<Key, Value, MemoryUsedBy>::trim(const uint64_t wantSpace)
 
 template <class Key, class Value, uint64_t MemoryUsedBy(const Value &)>
 ClpMap<Key, Value, MemoryUsedBy>::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<time_t>::max()))
+    key(aKey),
+    value(v),
+    expires(Sum(squid_curtime, ttl).value_or(std::numeric_limits<time_t>::max()))
 {
 }
 
 #endif /* SQUID__SRC_BASE_CLPMAP_H */
+

diff --git a/src/base/Optional.h b/src/base/Optional.h
index f7c1e5834c7e58c9582b26dfb38cd321f23c653d..aede04bde6edc989fa1524b82239c10574a7bdb1 100644 (file)
--- 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 086d3391403bafcf473577a040c630763e8f4fc9..b0404d127fa2097123cdf7a7a94f45880441acd5 100644 (file)
--- 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 34691db5955d021be59eeeb1a060e970821f64b2..2d41da3d0a282b98182b252854cfe9bacbb27316 100644 (file)
--- 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 a1f72d8ad68dd9f6b1c653ec68080b46b7079ea0..599cc1120c5756b5f69b8221a6f9c1507f19cc56 100644 (file)
--- 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 6184f85de981c052492aeda108e3ac5fa281bbf2..7e9d3ab7250165698d9f6f844d17a2e631a354a0 100644 (file)
--- 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 442dc53e05b57bf18d0ecb91be66f5a63265a533..8679a096cf825c1e4e9de09d13bdf8a19440be48 100644 (file)
--- 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 e1f236b28491b215acbb2f97dc4ed1c6d869a8b2..42d5452c948b3c4bb68ba5cc8ebd29ffc2683052 100644 (file)
--- a/src/mem/PoolingAllocator.h
+++ b/src/mem/PoolingAllocator.h
@@ -36,7 +36,7 @@ public:
 
     template <class OtherValue>
     struct rebind {
-      typedef PoolingAllocator<OtherValue> other;
+        typedef PoolingAllocator<OtherValue> other;
     };
 
     template<class U, class ... Args> void construct(U *p, Args && ... args) { new((void *)p) U(std::forward<Args>(args)...); }

diff --git a/src/peer_select.cc b/src/peer_select.cc
index 1645f0fa19c11c08a0d76bb39d35351d19f564cf..2bdfa23882c4c0c071dae5d76aba3eec95c72394 100644 (file)
--- 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 15cc9eecd0f7e4e49965c847be9a28e74e7db4af..10b8e838b021b078358a8f23c89b7b01bb509608 100644 (file)
--- 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 4637b57b3331471e635d006aa0303ff86ed46e0f..57784c57bf361474dc722b7bdc5529955e0379fa 100644 (file)
--- 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 70721a489cffa7693d31e8ac115359c55b31f17d..07213ec4dc5af9d1c7e4cf5ae083834449549f9a 100644 (file)
--- 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 2a72a267e585a75c012ffdf4256cf17f16a3089e..7219bc34f8068144357f2d10eca73181107d8c84 100644 (file)
--- 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 5aebd0ad91c9475bfdf684eac3457af6d9dd70c0..be683b01bfbc9fd0cabec9fa1c6623649456d6ca 100644 (file)
--- 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 76c2cdce5410b571c6b1193965f77524af21a631..08fe8e4f10d25263c76d82cec2e225a53ad66588 100644 (file)
--- 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 2f1e40ed5ec640f8750485ac3f5716ddb2d8a2eb..1a2bb49fdc2ac83d096ee5a1f34604d3416f6fe7 100644 (file)
--- 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 c2ad6295959ae68c97185d1f6525553f3aa3cabd..ba710aad3af44cd5eb148b6e6d0dc18e0643c9a6 100644 (file)
--- 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 bd351dd3ee463ba612eccbcafc7f32a811563b21..4d5fff85d859b0b8e9f94bdc753ad80897cf5fbe 100644 (file)
--- 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 b58b6505b28f3752707a970efc84789ce0b9900d..7bf248facbe39f6f7f2a09c0499f72ce5fb5fb9d 100644 (file)
--- 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 d013f0ccbd3def8c5fb1c2a0195837e8bf96df71..7820e89095a4eda904f1e8b1279a901e1f0122ae 100644 (file)
--- 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)