Indented and polished.

diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h
index 418c85b703d2d3560f6f77f3fae3b4206559642d..15b29b0ab82c111eb072f66fe4db0e35550c7634 100644 (file)
--- a/src/adaptation/AccessCheck.h
+++ b/src/adaptation/AccessCheck.h
@@ -1,5 +1,5 @@
-#ifndef SQUID_ADAPTATION__ACCESS_H
-#define SQUID_ADAPTATION__ACCESS_H
+#ifndef SQUID_ADAPTATION__ACCESS_CHECK_H
+#define SQUID_ADAPTATION__ACCESS_CHECK_H
 
 #include "ICAP/AsyncJob.h"
 #include "adaptation/Elements.h"
@@ -57,4 +57,4 @@ private:
 
 } // namespace Adaptation
 
-#endif /* SQUID_ADAPTATION__ACCESS_H */
+#endif /* SQUID_ADAPTATION__ACCESS_CHECK_H */

diff --git a/src/adaptation/AccessRule.h b/src/adaptation/AccessRule.h
index 6d4b84e9a2407fec51adc6ba1b5b735f04909e90..0e5eaf408aa81a3f2749312d2bdc81fadef15190 100644 (file)
--- a/src/adaptation/AccessRule.h
+++ b/src/adaptation/AccessRule.h
@@ -16,7 +16,7 @@ public:
     ~AccessRule();
 
     void parse(ConfigParser &parser);
-    void finalize();   
+    void finalize();
 
     // service group consisting of one or more services
     ServiceGroup *group();

diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc
index b6d1e7df878eafa88b09f9e1582d62cdfa2e3b98..f2b361a05dbc2bad3b4851c2091fbe0a5e379e6b 100644 (file)
--- a/src/adaptation/Config.cc
+++ b/src/adaptation/Config.cc
@@ -36,7 +36,7 @@
 #include "ConfigParser.h"
 #include "ACL.h"
 #include "Store.h"
-#include "Array.h"     // really Vector
+#include "Array.h"    // really Vector
 #include "adaptation/Config.h"
 #include "adaptation/Service.h"
 #include "adaptation/AccessRule.h"
@@ -57,7 +57,7 @@ Adaptation::Config::freeService()
     while (!serviceConfigs.empty()) {
         delete serviceConfigs.back();
         serviceConfigs.pop_back();
-       }
+    }
 }
 
 void
@@ -120,9 +120,9 @@ void
 Adaptation::Config::FreeServiceSet()
 {
     while (!AllGroups().empty()) {
-               delete AllGroups().back();
-               AllGroups().pop_back();
-       }
+        delete AllGroups().back();
+        AllGroups().pop_back();
+    }
 }
 
 void
@@ -147,7 +147,7 @@ Adaptation::Config::FreeAccess()
     while (!AllRules().empty()) {
         delete AllRules().back();
         AllRules().pop_back();
-       }
+    }
 }
 
 void
@@ -159,7 +159,7 @@ Adaptation::Config::DumpAccess(StoreEntry *entry, const char *name)
     for (CI i = AllRules().begin(); i != AllRules().end(); ++i) {
         snprintf(nom, 64, "%s %s", name, (*i)->groupId.buf());
         dump_acl_access(entry, nom, (*i)->acl);
-       }
+    }
 }
 
 Adaptation::Config::Config()
@@ -178,7 +178,7 @@ Adaptation::Config::~Config()
     while (!AllServices().empty()) {
         AllServices().back()->invalidate();
         AllServices().pop_back();
-       }
+    }
 
     freeService();
 }

diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h
index 065ea0f4dcc4a76b195a33c41d9714605583d4b1..72392a271812adf5fe8a3fc24e256c46b4698277 100644 (file)
--- a/src/adaptation/Config.h
+++ b/src/adaptation/Config.h
@@ -25,7 +25,7 @@ class AccessRule;
 class Config
 {
 public:
-       static void Finalize();
+    static void Finalize();
 
     static void ParseServiceSet(void);
     static void FreeServiceSet(void);
@@ -35,7 +35,7 @@ public:
     static void FreeAccess(void);
     static void DumpAccess(StoreEntry *, const char *);
 
-       friend class AccessCheck;
+    friend class AccessCheck;
 
 public:
 

diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h
index 50bf99a497722ada70e0a2b28e88eeaf4bd7fece..ba00d97f36d38688d7256e09d63ff48b3ceb879c 100644 (file)
--- a/src/adaptation/Initiate.h
+++ b/src/adaptation/Initiate.h
@@ -28,8 +28,8 @@ public:
     bool operator != (void *) const { return prime != NULL; }
     bool operator !() const { return !prime; }
 
-       bool isThere(); // we have a valid initiator pointer
-       Initiator *ptr(); // asserts isThere()
+    bool isThere(); // we have a valid initiator pointer
+    Initiator *ptr(); // asserts isThere()
 
 private:
     InitiatorHolder &operator =(const InitiatorHolder &anInitiator);

diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h
index e76f1474f18d349598daa8e9be94b81d8a0a9758..e26236c5e964ab575e179a27c65f47e85b599d95 100644 (file)
--- a/src/adaptation/ServiceGroups.h
+++ b/src/adaptation/ServiceGroups.h
@@ -19,9 +19,9 @@ public:
     // The iterators point back to 
     struct Loop {
         Loop(const iterator &b, const iterator &e): begin(b), end(e) {}
-               iterator begin;
-               iterator end;
-       };
+        iterator begin;
+        iterator end;
+    };
 
 public:
     ServiceGroup(const String &aKind);