---------------------
PatchSet 5879 
Date: 2007/10/05 05:48:33
Author: amosjeffries
Branch: docs
Tag: (none) 
Log:
ESI methods should be defined with the same types as they use.

Members: 
	src/ESIExpatParser.h:1.4->1.4.20.1 
	src/ESIParser.cc:1.5->1.5.20.1 
	src/ESIParser.h:1.5->1.5.20.1 

Index: squid3/src/ESIExpatParser.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ESIExpatParser.h,v
retrieving revision 1.4
retrieving revision 1.4.20.1
diff -u -r1.4 -r1.4.20.1
--- squid3/src/ESIExpatParser.h	4 Jul 2005 02:14:11 -0000	1.4
+++ squid3/src/ESIExpatParser.h	5 Oct 2007 05:48:33 -0000	1.4.20.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ESIExpatParser.h,v 1.4 2005/07/04 02:14:11 squidadm Exp $
+ * $Id: ESIExpatParser.h,v 1.4.20.1 2007/10/05 05:48:33 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -42,18 +42,21 @@
 public:
     ESIExpatParser(ESIParserClient *);
     ~ESIExpatParser();
-    /* true on success */
+
+    /** \retval true	on success */
     bool parse(char const *dataToParse, size_t const lengthOfData, bool const endOfStream);
+
     long int lineNumber() const;
     char const * errorString() const;
 
 private:
     ESI_PARSER_TYPE;
-    mutable XML_Parser p; /* our parser */
-    static void Start(void *data, const char *el, const char **attr);
-    static void End(void *data, const char *el);
-    static void Default (void *data, const char *s, int len);
-    static void Comment (void *data, const char *s);
+    /** our parser */
+    mutable XML_Parser p;
+    static void Start(void *data, const XML_Char *el, const char **attr);
+    static void End(void *data, const XML_Char *el);
+    static void Default (void *data, const XML_Char *s, int len);
+    static void Comment (void *data, const XML_Char *s);
     XML_Parser &myParser() const {return p;}
 
     ESIParserClient *theClient;
Index: squid3/src/ESIParser.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ESIParser.cc,v
retrieving revision 1.5
retrieving revision 1.5.20.1
diff -u -r1.5 -r1.5.20.1
--- squid3/src/ESIParser.cc	30 Mar 2005 02:14:36 -0000	1.5
+++ squid3/src/ESIParser.cc	5 Oct 2007 05:48:33 -0000	1.5.20.1
@@ -1,6 +1,5 @@
-
 /*
- * $Id: ESIParser.cc,v 1.5 2005/03/30 02:14:36 squidadm Exp $
+ * $Id: ESIParser.cc,v 1.5.20.1 2007/10/05 05:48:33 amosjeffries Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
Index: squid3/src/ESIParser.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ESIParser.h,v
retrieving revision 1.5
retrieving revision 1.5.20.1
diff -u -r1.5 -r1.5.20.1
--- squid3/src/ESIParser.h	4 Jul 2005 02:14:11 -0000	1.5
+++ squid3/src/ESIParser.h	5 Oct 2007 05:48:33 -0000	1.5.20.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ESIParser.h,v 1.5 2005/07/04 02:14:11 squidadm Exp $
+ * $Id: ESIParser.h,v 1.5.20.1 2007/10/05 05:48:33 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -41,9 +41,9 @@
     virtual void end(const char *el) = 0;
     virtual void parserDefault (const char *s, int len) =0;
     virtual void parserComment (const char *s) = 0;
-    virtual ~ESIParserClient() {}}
+    virtual ~ESIParserClient() {};
 
-;
+};
 
 class ESIParser : public RefCountable
 {