From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Mon, 28 Jan 2013 01:14:56 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_4_0_1~340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aec45181e722c2bff26e3295e29d5fa2edd1c33a;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc
index 68bd743b79..37d8ee571f 100644
--- a/src/acl/Acl.cc
+++ b/src/acl/Acl.cc
@@ -44,27 +44,26 @@ const ACLFlag ACLFlags::NoFlags[1] = {ACL_F_END};
 
 const char *AclMatchedName = NULL;
 
-bool ACLFlags::supported(const ACLFlag f) const 
+bool ACLFlags::supported(const ACLFlag f) const
 {
     if (f == ACL_F_REGEX_CASE)
         return true;
-    return (supported_.find(f) != std::string::npos); 
+    return (supported_.find(f) != std::string::npos);
 }
 
-void 
+void
 ACLFlags::parseFlags(char * &nextToken)
 {
-    while((nextToken = ConfigParser::strtokFile()) != NULL && nextToken[0] == '-') {
+    while ((nextToken = ConfigParser::strtokFile()) != NULL && nextToken[0] == '-') {
 
         //if token is the "--" break flag
-        if (strcmp(nextToken, "--") == 0) 
+        if (strcmp(nextToken, "--") == 0)
             break;
 
         for (const char *flg = nextToken+1; *flg!='\0'; flg++ ) {
             if (supported(*flg)) {
                 makeSet(*flg);
-            }
-            else {
+            } else {
                 debugs(28, 0, HERE << "Flag '" << *flg << "' not supported");
                 self_destruct();
             }
diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index 0727ef9c9e..5e19ee4983 100644
--- a/src/acl/Acl.h
+++ b/src/acl/Acl.h
@@ -77,7 +77,7 @@ public:
 private:
     /// Convert a flag to a 64bit unsigned integer.
     /// The characters from 'A' to 'z' represented by the values from 65 to 122.
-    /// They are 57 different characters which can be fit to the bits of an 64bit 
+    /// They are 57 different characters which can be fit to the bits of an 64bit
     /// integer.
     uint64_t flagToInt(const ACLFlag f) const {
         assert('A' <= f && f <= 'z');
@@ -104,7 +104,7 @@ public:
     static ACL* FindByName(const char *name);
 
     ACL();
-    explicit ACL(const ACLFlag flgs[]) : cfgline(NULL), flags(flgs){}
+    explicit ACL(const ACLFlag flgs[]) : cfgline(NULL), flags(flgs) {}
     virtual ~ACL();
     virtual ACL *clone()const = 0;
     virtual void parse() = 0;
diff --git a/src/acl/DestinationIp.cc b/src/acl/DestinationIp.cc
index 2dfc602ea3..68ede133a6 100644
--- a/src/acl/DestinationIp.cc
+++ b/src/acl/DestinationIp.cc
@@ -67,7 +67,7 @@ ACLDestinationIP::match(ACLChecklist *cl)
             return 0;
         }
 
-        if(ACLIP::match(checklist->request->host_addr))
+        if (ACLIP::match(checklist->request->host_addr))
             return 1;
         return 0;
     }