---------------------
PatchSet 1601 
Date: 2005/08/25 16:39:02
Author: dwsquid
Branch: squid3-icap
Tag: (none) 
Log:
remove #if MSG_PIPE_USES_MEM_HDR

Members: 
	src/ICAPAnchor.cc:1.1.2.16->1.1.2.17 
	src/MsgPipeData.h:1.1.2.5->1.1.2.6 

Index: squid3/src/ICAPAnchor.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPAnchor.cc,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- squid3/src/ICAPAnchor.cc	24 Aug 2005 21:07:29 -0000	1.1.2.16
+++ squid3/src/ICAPAnchor.cc	25 Aug 2005 16:39:02 -0000	1.1.2.17
@@ -27,12 +27,8 @@
 	virgin->data = new MsgPipeData;
 	virgin->data->cause = request;
 	virgin->data->header = reply;
-#if MSG_PIPE_USES_MEM_HDR
-	virgin->data->body = new mem_hdr;
-#else
 	virgin->data->body = new MemBuf;
 	memBufInit(virgin->data->body, ICAPMsgPipeBufSizeMin, ICAPMsgPipeBufSizeMax);
-#endif
 
 	adapted = new MsgPipe("adapted");
 	adapted->sink = this;
@@ -52,12 +48,8 @@
 void ICAPAnchor::sendMoreData(StoreIOBuffer buf) {
 	debug(93,5)("ICAPAnchor::sendMoreData() called\n");
 	//buf.dump();
-#if MSG_PIPE_USES_MEM_HDR
-        virgin->data->body->write(buf);
-#else
 	virgin->data->body->append(buf.data,
 		XMIN(buf.length, (size_t)virgin->data->body->potentialSpaceSize()));
-#endif
 	virgin->sendSourceProgress();
 }
 
Index: squid3/src/MsgPipeData.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Attic/MsgPipeData.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- squid3/src/MsgPipeData.h	24 Aug 2005 05:45:25 -0000	1.1.2.5
+++ squid3/src/MsgPipeData.h	25 Aug 2005 16:39:02 -0000	1.1.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MsgPipeData.h,v 1.1.2.5 2005/08/24 05:45:25 rousskov Exp $
+ * $Id: MsgPipeData.h,v 1.1.2.6 2005/08/25 16:39:02 dwsquid Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -36,11 +36,7 @@
 
 #include "HttpReply.h"
 
-#if MSG_PIPE_USES_MEM_HDR
-class mem_hdr;
-#else
 class MemBuf;
-#endif
 
 // MsgPipeData contains information about the HTTP message being sent
 // from the pipe source to the sink. Since the entire message body may be
@@ -57,11 +53,7 @@
 
 public:
 	typedef HttpReply Header;
-#if MSG_PIPE_USES_MEM_HDR
-	typedef mem_hdr Body;
-#else
 	typedef MemBuf Body;
-#endif
 
 	// message being piped
 	Header *header; // parsed HTTP headers