Cleanup: zap CVS Id tags

[thirdparty/squid.git] / src / ESIVarState.h

diff --git a/src/ESIVarState.h b/src/ESIVarState.h
index a4cf31c2ca4a44d87bdeea6cf1ecc35099488f96..66c34ecaacef4991b736b7aaf1e70a0aef469132 100644 (file)
--- a/src/ESIVarState.h
+++ b/src/ESIVarState.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIVarState.h,v 1.3 2007/05/18 06:41:22 amosjeffries Exp $
+ * $Id$
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -19,12 +19,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -51,7 +51,7 @@ extern char const * esiBrowsers[];
 
 /* Recursive uses are not supported by design */
 
-struct _query_elem{char *var, *val;};
+struct _query_elem {char *var, *val;};
 
 class ESIVarState
 {
@@ -64,7 +64,7 @@ public:
 
     class Variable;
     void addVariable (char const *, size_t, Variable *);
-    void removeVariable (string const &);
+    void removeVariable (String const &);
 
     void *operator new (size_t byteCount);
     void operator delete (void *address);
@@ -86,26 +86,13 @@ private:
     ESISegment::Pointer output;
     HttpHeader hdr;
 
-    struct
-    {
-
-int language:
-        1;
-
-int cookie:
-        1;
-
-int host:
-        1;
-
-int referer:
-        1;
-
-int useragent:
-        1;
-    }
-
-    flags;
+    struct {
+        int language:1;
+        int cookie:1;
+        int host:1;
+        int referer:1;
+        int useragent:1;
+    } flags;
 
 public:
 
@@ -115,7 +102,7 @@ public:
     public:
         Variable () {}
 
-        virtual ~Variable(){}
+        virtual ~Variable() {}
 
         /* prevent synthetics */
         Variable (Variable const &) {}
@@ -190,7 +177,7 @@ public:
 
 private:
     static char const * esiUserOs[];
-    enum esiUserOs_t{
+    enum esiUserOs_t {
         ESI_OS_WIN,
         ESI_OS_MAC,
         ESI_OS_UNIX,