--------------------- PatchSet 7449 Date: 2008/03/04 22:18:45 Author: amosjeffries Branch: cleanup Tag: (none) Log: .h cleanups Members: src/DelaySpec.h:1.2.56.1->1.2.56.2 src/ESICustomParser.h:1.8->1.8.20.1 src/ESIParser.h:1.5.44.1->1.5.44.2 src/Generic.h:1.6->1.6.48.1 Index: squid3/src/DelaySpec.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/DelaySpec.h,v retrieving revision 1.2.56.1 retrieving revision 1.2.56.2 diff -u -r1.2.56.1 -r1.2.56.2 --- squid3/src/DelaySpec.h 27 Feb 2008 04:28:57 -0000 1.2.56.1 +++ squid3/src/DelaySpec.h 4 Mar 2008 22:18:45 -0000 1.2.56.2 @@ -1,5 +1,5 @@ /* - * $Id: DelaySpec.h,v 1.2.56.1 2008/02/27 04:28:57 amosjeffries Exp $ + * $Id: DelaySpec.h,v 1.2.56.2 2008/03/04 22:18:45 amosjeffries Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -29,18 +29,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ - #ifndef SQUID_DELAYSPEC_H #define SQUID_DELAYSPEC_H +class StoreEntry; + /// \ingroup DelyPoolsAPI class DelaySpec { public: DelaySpec(); - void stats (StoreEntry * sentry, char const *) const; - void dump (StoreEntry *) const; + void stats(StoreEntry * sentry, char const *) const; + void dump(StoreEntry *) const; void parse(); int restore_bps; int max_bytes; Index: squid3/src/ESICustomParser.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ESICustomParser.h,v retrieving revision 1.8 retrieving revision 1.8.20.1 diff -u -r1.8 -r1.8.20.1 --- squid3/src/ESICustomParser.h 29 May 2007 13:51:36 -0000 1.8 +++ squid3/src/ESICustomParser.h 4 Mar 2008 22:18:45 -0000 1.8.20.1 @@ -1,5 +1,5 @@ /* - * $Id: ESICustomParser.h,v 1.8 2007/05/29 13:51:36 squidadm Exp $ + * $Id: ESICustomParser.h,v 1.8.20.1 2008/03/04 22:18:45 amosjeffries Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -29,14 +29,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ - #ifndef SQUID_ESICUSTOMPARSER_H #define SQUID_ESICUSTOMPARSER_H +class Trie; + +/* inherits from */ #include "ESIParser.h" -class Trie; +/* for String variables */ +#include "SquidString.h" +/** + \ingroup ESIAPI + */ class ESICustomParser : public ESIParser { Index: squid3/src/ESIParser.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ESIParser.h,v retrieving revision 1.5.44.1 retrieving revision 1.5.44.2 diff -u -r1.5.44.1 -r1.5.44.2 --- squid3/src/ESIParser.h 27 Feb 2008 04:28:57 -0000 1.5.44.1 +++ squid3/src/ESIParser.h 4 Mar 2008 22:18:45 -0000 1.5.44.2 @@ -1,5 +1,5 @@ /* - * $Id: ESIParser.h,v 1.5.44.1 2008/02/27 04:28:57 amosjeffries Exp $ + * $Id: ESIParser.h,v 1.5.44.2 2008/03/04 22:18:45 amosjeffries Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -29,32 +29,41 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ - #ifndef SQUID_ESIPARSER_H #define SQUID_ESIPARSER_H +/* for size_t */ +#include "config.h" + class ESIParserClient { - public: virtual void start(const char *el, const char **attr, size_t attrCount) = 0; 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() {}; - }; + +/* for RefCountable */ +#include "RefCount.h" + class ESIParser : public RefCountable { - public: typedef RefCount Pointer; + static void registerParser(const char *name, Pointer (*new_func)(ESIParserClient *aClient)); static Pointer NewParser(ESIParserClient *aClient); static char *Type; - /* true on success */ + + /** + \retval true on success + \retval false on what? + */ virtual bool parse(char const *dataToParse, size_t const lengthOfData, bool const endOfStream) = 0; + virtual long int lineNumber() const =0; virtual char const * errorString() const =0; @@ -95,4 +104,6 @@ #define ESI_PARSER_TYPE \ static ESIParser::Pointer NewParser(ESIParserClient *aClient); \ static ESIParser::Register thisParser + + #endif /* SQUID_ESIPARSER_H */ Index: squid3/src/Generic.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Generic.h,v retrieving revision 1.6 retrieving revision 1.6.48.1 diff -u -r1.6 -r1.6.48.1 --- squid3/src/Generic.h 21 Dec 2004 03:14:16 -0000 1.6 +++ squid3/src/Generic.h 4 Mar 2008 22:18:45 -0000 1.6.48.1 @@ -1,6 +1,5 @@ - /* - * $Id: Generic.h,v 1.6 2004/12/21 03:14:16 squidadm Exp $ + * $Id: Generic.h,v 1.6.48.1 2008/03/04 22:18:45 amosjeffries Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -30,12 +29,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ - #ifndef SQUID_GENERIC_H #define SQUID_GENERIC_H -template +#include "dlink.h" +template struct unary_function { typedef _Arg argument_type; @@ -61,7 +60,6 @@ } template - class Stack; template @@ -78,7 +76,6 @@ */ template - class InstanceToSingletonAdapter : public C { @@ -119,7 +116,6 @@ /* generic ostream printer */ template - struct PointerPrinter { PointerPrinter(std::ostream &astream, std::string aDelimiter) : os(astream), delimiter (aDelimiter) {}