From: Source Maintenance <squidadm@squid-cache.org>
Date: Tue, 31 Jan 2017 00:12:18 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: M-staged-PR71~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8f75894774ab7c91fcca4e59f5238fdb0349230;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/Notes.cc b/src/Notes.cc
index d30e5977c9..d424489b4b 100644
--- a/src/Notes.cc
+++ b/src/Notes.cc
@@ -192,7 +192,7 @@ Notes::parseKvPair() {
             assert(method == Note::Value::mhReplace);
             if (Note::Pointer oldNote = find(SBuf(k, keyLen)))
                 debugs(28, DBG_CRITICAL, "Warning: annotation configuration with key " << k <<
-                        " already exists and will be overwritten");
+                       " already exists and will be overwritten");
         }
         SBuf key(k, keyLen);
         validateKey(key);
diff --git a/src/Notes.h b/src/Notes.h
index 2e5908e5c6..a24981cc78 100644
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -80,7 +80,7 @@ public:
     /// Adds a value to the note and returns a pointer to the
     /// related Value object.
     Value::Pointer addValue(const char *value, const bool quoted, const char *descr,
-            const Value::Method m = Value::mhAppend);
+                            const Value::Method m = Value::mhAppend);
 
     /// Walks through the  possible values list of the note, selects
     /// the first value, matching the given HttpRequest and HttpReply
@@ -140,7 +140,7 @@ public:
     /// entries separated by sep string.
     const char *toString(const char *sep = "\r\n") const;
     void updateNotePairs(NotePairsPointer pairs, const CharacterSet *delimiters,
-            const AccessLogEntryPointer &al);
+                         const AccessLogEntryPointer &al);
 private:
 
     /// Verifies that the key is not blacklisted (fatal error) and
diff --git a/src/acl/AnnotateClient.cc b/src/acl/AnnotateClient.cc
index 2360486093..3aa16ad033 100644
--- a/src/acl/AnnotateClient.cc
+++ b/src/acl/AnnotateClient.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
diff --git a/src/acl/AnnotateClient.h b/src/acl/AnnotateClient.h
index 45fd6668a1..bb63ca3cb1 100644
--- a/src/acl/AnnotateClient.h
+++ b/src/acl/AnnotateClient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
diff --git a/src/acl/AnnotateTransaction.cc b/src/acl/AnnotateTransaction.cc
index e3709585d4..ff758c9918 100644
--- a/src/acl/AnnotateTransaction.cc
+++ b/src/acl/AnnotateTransaction.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
diff --git a/src/acl/AnnotateTransaction.h b/src/acl/AnnotateTransaction.h
index cb9188148e..441db54b42 100644
--- a/src/acl/AnnotateTransaction.h
+++ b/src/acl/AnnotateTransaction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
diff --git a/src/acl/AnnotationData.cc b/src/acl/AnnotationData.cc
index 062afcd130..ac0a28b618 100644
--- a/src/acl/AnnotationData.cc
+++ b/src/acl/AnnotationData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
diff --git a/src/acl/AnnotationData.h b/src/acl/AnnotationData.h
index 9c15ab3817..e38f01d67c 100644
--- a/src/acl/AnnotationData.h
+++ b/src/acl/AnnotationData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index b05e1c2e96..dbb79422fa 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1686,7 +1686,7 @@ ClientHttpRequest::doCallouts()
         // Make the previously set client connection ID available as annotation.
         if (ConnStateData *csd = calloutContext->http->getConn()) {
             if (!csd->notes()->empty())
-            	calloutContext->http->request->notes()->appendNewOnly(csd->notes().getRaw());
+                calloutContext->http->request->notes()->appendNewOnly(csd->notes().getRaw());
         }
         ale->syncNotes(calloutContext->http->request);
     }