SourceFormat Enforcement

diff --git a/src/ipc/TypedMsgHdr.cc b/src/ipc/TypedMsgHdr.cc
index 15860c6ccea0a021262cd6924f6b7d41c2ef3bc3..fe201b34e52c319ed54fe84cac9719f7b84e302f 100644 (file)
--- a/src/ipc/TypedMsgHdr.cc
+++ b/src/ipc/TypedMsgHdr.cc
@@ -170,10 +170,10 @@ Ipc::TypedMsgHdr::putRaw(const void *rawBuf, size_t rawSize)
 bool
 Ipc::TypedMsgHdr::hasFd() const
 {
-     struct cmsghdr *cmsg = CMSG_FIRSTHDR(this);
-     return cmsg &&
-         cmsg->cmsg_level == SOL_SOCKET &&
-         cmsg->cmsg_type == SCM_RIGHTS;
+    struct cmsghdr *cmsg = CMSG_FIRSTHDR(this);
+    return cmsg &&
+           cmsg->cmsg_level == SOL_SOCKET &&
+           cmsg->cmsg_type == SCM_RIGHTS;
 }
 
 void

diff --git a/src/tests/Stub.list b/src/tests/Stub.list
index 6ba831640d12ac5411a75b6e7186e56ce13876e4..b01b39344b3b1ec7cde205987cc39a7d86e2103c 100644 (file)
--- a/src/tests/Stub.list
+++ b/src/tests/Stub.list
@@ -3,6 +3,7 @@ STUB_SOURCE= tests/STUB.h \
        tests/stub_CommIO.cc \
        tests/stub_DelayId.cc \
        tests/stub_DiskIOModule.cc \
+       tests/stub_ETag.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_HttpReply.cc \
        tests/stub_HttpRequest.cc \
@@ -11,18 +12,20 @@ STUB_SOURCE= tests/STUB.h \
        tests/stub_MemStore.cc \
        tests/stub_Port.cc \
        tests/stub_StatHist.cc \
+       tests/stub_StoreMeta.cc \
+       tests/stub_SwapDir.cc \
        tests/stub_UdsOp.cc \
        tests/stub_access_log.cc \
        tests/stub_acl.cc \
        tests/stub_cache_cf.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_comm.cc \
        tests/stub_debug.cc \
-       tests/stub_ETag.cc \
        tests/stub_errorpage.cc \
        tests/stub_event.cc \
        tests/stub_external_acl.cc \
@@ -51,10 +54,8 @@ STUB_SOURCE= tests/STUB.h \
        tests/stub_pconn.cc \
        tests/stub_redirect.cc \
        tests/stub_stat.cc \
-       tests/stub_SwapDir.cc \
        tests/stub_stmem.cc \
        tests/stub_store.cc \
-       tests/stub_StoreMeta.cc \
        tests/stub_store_client.cc \
        tests/stub_store_digest.cc \
        tests/stub_store_rebuild.cc \

diff --git a/src/tests/stub_CacheDigest.cc b/src/tests/stub_CacheDigest.cc
index dffeeedab28aab8da1c43e958d3d881ce8f43400..0f8fba2af786de77646b31fdff34d867ac1b82a1 100644 (file)
--- a/src/tests/stub_CacheDigest.cc
+++ b/src/tests/stub_CacheDigest.cc
@@ -22,4 +22,3 @@ void cacheDigestGuessStatsReport(const CacheDigestGuessStats *, StoreEntry *, co
 void cacheDigestReport(CacheDigest *, const char *, StoreEntry *) STUB
 size_t cacheDigestCalcMaskSize(int, int) STUB_RETVAL(1)
 
-

diff --git a/src/tests/stub_ETag.cc b/src/tests/stub_ETag.cc
index 3805ea99b48169bf110365285dd73213d75b61e4..3f993608a1f606a270abbc1fd6edfebb397e967b 100644 (file)
--- a/src/tests/stub_ETag.cc
+++ b/src/tests/stub_ETag.cc
@@ -8,4 +8,3 @@ int etagParseInit(ETag * , const char *) STUB_RETVAL(0)
 bool etagIsStrongEqual(const ETag &, const ETag &) STUB_RETVAL(false)
 bool etagIsWeakEqual(const ETag &, const ETag &) STUB_RETVAL(false)
 
-