---------------------
PatchSet 94 
Date: 2002/11/01 00:40:49
Author: rbcollins
Branch: esi
Tag: (none) 
Log:
towards C++ for render()

Members: 
	src/ESI.cc:1.1.2.3->1.1.2.4 

Index: squid3/src/ESI.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ESI.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid3/src/ESI.cc	1 Nov 2002 00:34:41 -0000	1.1.2.3
+++ squid3/src/ESI.cc	1 Nov 2002 00:40:49 -0000	1.1.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESI.cc,v 1.1.2.3 2002/11/01 00:34:41 rbcollins Exp $
+ * $Id: ESI.cc,v 1.1.2.4 2002/11/01 00:40:49 rbcollins Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -189,7 +189,6 @@
 static esiProcessSelf esiLiteralProcess;
 
 static esiAddElement esiSequenceAdd;
-static esiRender esiSequenceRender;
 static esiProcessSelf esiSequenceProcess;
 
 static esiProcessSelf esiIncludeProcess;
@@ -229,12 +228,12 @@
 static esiElementType _esiRemove   = {esiRemoveRender, esiRemoveAdd, esiProcessComplete};
 static esiElementType _esiTry      = {esiTryRender, esiTryAdd, esiTryProcess};
 /* esiAttempt, esiExcept, esiVar, esiWhen and esiOtherwise are 'Sequences' */
-static esiElementType _esiAttempt  = {esiSequenceRender,esiSequenceAdd,esiSequenceProcess};
-static esiElementType _esiExcept   = {esiSequenceRender,esiSequenceAdd,esiSequenceProcess};
-static esiElementType _esiVar      = {esiSequenceRender,esiSequenceAdd,esiSequenceProcess};
+static esiElementType _esiAttempt  = {esiRenderSelf,esiSequenceAdd,esiSequenceProcess};
+static esiElementType _esiExcept   = {esiRenderSelf,esiSequenceAdd,esiSequenceProcess};
+static esiElementType _esiVar      = {esiRenderSelf,esiSequenceAdd,esiSequenceProcess};
 static esiElementType _esiChoose   = {esiChooseRender, esiChooseAdd, esiChooseProcess};
-static esiElementType _esiWhen     = {esiSequenceRender,esiSequenceAdd,esiSequenceProcess};
-static esiElementType _esiOtherwise= {esiSequenceRender,esiSequenceAdd,esiSequenceProcess};
+static esiElementType _esiWhen     = {esiRenderSelf,esiSequenceAdd,esiSequenceProcess};
+static esiElementType _esiOtherwise= {esiRenderSelf,esiSequenceAdd,esiSequenceProcess};
 
 
 /* esiComment */
@@ -1870,12 +1869,6 @@
 }
 
 void
-esiSequenceRender (void *data, esiSegment *output)
-{
-    ((esiSequence *)data)->render(output);
-}
-
-void
 esiSequence::render(esiSegment *output)
 {
     /* append all processed elements, and trim processed