From: Source Maintenance <squidadm@squid-cache.org>
Date: Sat, 12 Nov 2016 12:12:17 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: M-staged-PR71~377
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80bd33c3246def561da6041981f410300e37ab0e;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index 7704724908..dbb44fb4f7 100644
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -51,8 +51,8 @@ ACLUserData::dump() const
     sl.insert(sl.end(), userDataNames.begin(), userDataNames.end());
 
     debugs(28,5, "ACLUserData dump output: " <<
-        JoinContainerToSBuf(userDataNames.begin(), userDataNames.end(),
-        SBuf(" ")));
+           JoinContainerToSBuf(userDataNames.begin(), userDataNames.end(),
+                               SBuf(" ")));
     return sl;
 }
 
diff --git a/src/sbuf/Algorithms.h b/src/sbuf/Algorithms.h
index b24de5ea8c..9e4604a8be 100644
--- a/src/sbuf/Algorithms.h
+++ b/src/sbuf/Algorithms.h
@@ -66,18 +66,18 @@ private:
 template <class ContainerIterator>
 SBuf&
 JoinContainerIntoSBuf(SBuf &dest, const ContainerIterator &begin,
-		const ContainerIterator &end, const SBuf& separator,
-		const SBuf& prefix = SBuf(), const SBuf& suffix = SBuf())
+                      const ContainerIterator &end, const SBuf& separator,
+                      const SBuf& prefix = SBuf(), const SBuf& suffix = SBuf())
 {
     if (begin == end) {
-    	dest.append(prefix).append(suffix);
+        dest.append(prefix).append(suffix);
         return dest;
     }
 
     // optimization: pre-calculate needed storage
     const SBuf::size_type totalContainerSize =
-    		std::accumulate(begin, end, 0, SBufAddLength(separator)) +
-			dest.length() + prefix.length() + suffix.length();
+        std::accumulate(begin, end, 0, SBufAddLength(separator)) +
+        dest.length() + prefix.length() + suffix.length();
     SBufReservationRequirements req;
     req.minSpace = totalContainerSize;
     dest.reserve(req);
@@ -96,11 +96,11 @@ JoinContainerIntoSBuf(SBuf &dest, const ContainerIterator &begin,
 template <class ContainerIterator>
 SBuf
 JoinContainerToSBuf(const ContainerIterator &begin,
-		const ContainerIterator &end, const SBuf& separator,
-		const SBuf& prefix = SBuf(), const SBuf& suffix = SBuf())
+                    const ContainerIterator &end, const SBuf& separator,
+                    const SBuf& prefix = SBuf(), const SBuf& suffix = SBuf())
 {
-	SBuf rv;
-	return JoinContainerIntoSBuf(rv, begin, end, separator, prefix, suffix);
+    SBuf rv;
+    return JoinContainerIntoSBuf(rv, begin, end, separator, prefix, suffix);
 }
 
 namespace std {
diff --git a/src/tests/testSBufList.cc b/src/tests/testSBufList.cc
index 01fdf828c7..d53c538e22 100644
--- a/src/tests/testSBufList.cc
+++ b/src/tests/testSBufList.cc
@@ -43,9 +43,9 @@ testSBufList::testSBufListJoin()
     SBuf joined=JoinContainerToSBuf(foo.begin(), foo.end(),SBuf(" "));
     CPPUNIT_ASSERT_EQUAL(literal,joined);
     SBuf s1("1"), s2("2"), s3("3"), full("(1,2,3)");
-    SBufList sl{s1,s2,s3};
+    SBufList sl {s1,s2,s3};
     CPPUNIT_ASSERT_EQUAL(full, JoinContainerToSBuf(sl.begin(),
-    		sl.end(), SBuf(","), SBuf("("), SBuf(")")));
+                         sl.end(), SBuf(","), SBuf("("), SBuf(")")));
 
     CPPUNIT_ASSERT_EQUAL(SBuf(""),JoinContainerToSBuf(foo.begin(), foo.begin(),SBuf()));