From: Source Maintenance <squidadm@squid-cache.org>
Date: Thu, 24 Dec 2015 12:12:12 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_4_0_4~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5269fa822a27b8eb2fc7813da0e383f40cc46de7;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc
index 5dd7252f47..539657b903 100644
--- a/src/acl/Acl.cc
+++ b/src/acl/Acl.cc
@@ -114,8 +114,8 @@ ACLFlags::makeSet(const ACLFlag f, const SBuf &param)
 void
 ACLFlags::makeUnSet(const ACLFlag f)
 {
-   flags_ &= ~flagToInt(f);
-   flagParameters_[f].clear();
+    flags_ &= ~flagToInt(f);
+    flagParameters_[f].clear();
 }
 
 void
@@ -126,26 +126,26 @@ ACLFlags::parseFlags()
     while ((flag = tokenizer.nextFlag())) {
         switch (flagStatus(flag))
         {
-            case notSupported:
-                abortFlags("Flag '" << flag << "' not supported");
-                break;
-            case noParameter:
-                makeSet(flag);
-                break;
-            case parameterRequired:
-                if (!tokenizer.hasParameter()) {
-                    abortFlags("Flag '" << flag << "' must have a parameter");
-                    break;
-                }
-            case parameterOptional:
-                SBuf param;
-                if (tokenizer.hasParameter()) {
-                    param = tokenizer.getParameter();
-                    if (!parameterSupported(flag, param))
-                        abortFlags("Parameter '" << param << "' for flag '" << flag << "' not supported");
-                }
-                makeSet(flag, param);
+        case notSupported:
+            abortFlags("Flag '" << flag << "' not supported");
+            break;
+        case noParameter:
+            makeSet(flag);
+            break;
+        case parameterRequired:
+            if (!tokenizer.hasParameter()) {
+                abortFlags("Flag '" << flag << "' must have a parameter");
                 break;
+            }
+        case parameterOptional:
+            SBuf param;
+            if (tokenizer.hasParameter()) {
+                param = tokenizer.getParameter();
+                if (!parameterSupported(flag, param))
+                    abortFlags("Parameter '" << param << "' for flag '" << flag << "' not supported");
+            }
+            makeSet(flag, param);
+            break;
         }
     }
 
diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index 79b6e07f1e..24317d9046 100644
--- a/src/acl/Acl.h
+++ b/src/acl/Acl.h
@@ -76,22 +76,22 @@ public:
      */
     class FlagsTokenizer
     {
-        public:
-            FlagsTokenizer();
-            ACLFlag nextFlag(); ///< The next flag or '\0' if finished
-            /// \return true if a parameter follows the last parsed flag.
-            bool hasParameter() const;
-            /// \return the parameter of last parsed flag, if exist.
-            SBuf getParameter() const;
-
-        private:
-            /// \return true if the current token parsing is finished.
-            bool needNextToken() const;
-            /// Peeks at the next token and return false if the next token
-            /// is not flag, or a '--' is read.
-            bool nextToken();
-
-            char *tokPos;
+    public:
+        FlagsTokenizer();
+        ACLFlag nextFlag(); ///< The next flag or '\0' if finished
+        /// \return true if a parameter follows the last parsed flag.
+        bool hasParameter() const;
+        /// \return the parameter of last parsed flag, if exist.
+        SBuf getParameter() const;
+
+    private:
+        /// \return true if the current token parsing is finished.
+        bool needNextToken() const;
+        /// Peeks at the next token and return false if the next token
+        /// is not flag, or a '--' is read.
+        bool nextToken();
+
+        char *tokPos;
     };
 
 private:
diff --git a/src/acl/Note.cc b/src/acl/Note.cc
index c838d53bb3..50da73da0f 100644
--- a/src/acl/Note.cc
+++ b/src/acl/Note.cc
@@ -11,9 +11,9 @@
 #include "acl/HttpHeaderData.h"
 #include "acl/Note.h"
 #include "acl/NoteData.h"
-#include "parser/Tokenizer.h"
 #include "HttpRequest.h"
 #include "Notes.h"
+#include "parser/Tokenizer.h"
 
 int
 ACLNoteStrategy::match(ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &flags)