---------------------
PatchSet 817 
Date: 2003/07/13 12:59:55
Author: serassio
Branch: nt
Tag: (none) 
Log:
Updates for MSVC C++ compatibility

Members: 
	src/ACLCertificateData.cc:1.3.4.1->1.3.4.2 
	src/ACLDestinationDomain.cc:1.3.4.1->1.3.4.2 
	src/ACLDestinationIP.cc:1.2.4.1->1.2.4.2 
	src/ACLDomainData.cc:1.3->1.3.4.1 
	src/ACLExtUser.cc:1.1.2.2->1.1.2.3 
	src/ACLIP.cc:1.3->1.3.4.1 
	src/ACLIdent.cc:1.4.4.2->1.4.4.3 
	src/ACLMaxConnection.cc:1.1.2.1->1.1.2.2 
	src/ACLMaxUserIP.cc:1.1.2.2->1.1.2.3 
	src/ACLMethodData.cc:1.1.2.1->1.1.2.2 
	src/ACLMyIP.cc:1.2->1.2.4.1 
	src/ACLProtocolData.cc:1.1.2.1->1.1.2.2 
	src/ACLProxyAuth.cc:1.5.4.2->1.5.4.3 
	src/ACLRegexData.cc:1.3.4.1->1.3.4.2 
	src/ACLReplyHeaderStrategy.h:1.1.2.2->1.1.2.3 
	src/ACLRequestHeaderStrategy.h:1.2.4.3->1.2.4.4 
	src/ACLSourceIP.cc:1.2->1.2.4.1 
	src/ACLStrategised.h:1.2.4.1->1.2.4.2 
	src/ACLStringData.cc:1.1.2.1->1.1.2.2 
	src/ACLTimeData.cc:1.2->1.2.4.1 
	src/ACLUserData.cc:1.5.4.1->1.5.4.2 
	src/ESIElement.h:1.1.6.1->1.1.6.2 
	src/HttpHeader.cc:1.6.2.4->1.6.2.5 
	src/HttpReply.cc:1.7.2.5->1.7.2.6 
	src/SwapDir.h:1.4.2.1->1.4.2.2 
	src/acl.cc:1.15.2.2->1.15.2.3 
	src/asn.cc:1.8.2.3->1.8.2.4 
	src/comm.cc:1.19.2.11->1.19.2.12 
	src/errorpage.cc:1.11.2.6->1.11.2.7 
	src/external_acl.cc:1.14.2.14->1.14.2.15 
	src/auth/digest/auth_digest.cc:1.6.2.4->1.6.2.5 
	src/auth/ntlm/auth_ntlm.cc:1.6.2.4->1.6.2.5 
	src/fs/ufs/store_io_ufs.cc:1.7.2.1->1.7.2.2 

Index: squid3/src/ACLCertificateData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLCertificateData.cc,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- squid3/src/ACLCertificateData.cc	1 Mar 2003 16:18:29 -0000	1.3.4.1
+++ squid3/src/ACLCertificateData.cc	13 Jul 2003 13:02:55 -0000	1.3.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLCertificateData.cc,v 1.3.4.1 2003/03/01 16:18:29 serassio Exp $
+ * $Id: ACLCertificateData.cc,v 1.3.4.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLCertificateData::Pool(NULL);
+MemPool *ACLCertificateData::Pool = NULL;
 void *
 ACLCertificateData::operator new (size_t byteCount)
 {
Index: squid3/src/ACLDestinationDomain.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLDestinationDomain.cc,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- squid3/src/ACLDestinationDomain.cc	12 Jul 2003 08:01:32 -0000	1.3.4.1
+++ squid3/src/ACLDestinationDomain.cc	13 Jul 2003 13:02:55 -0000	1.3.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLDestinationDomain.cc,v 1.3.4.1 2003/07/12 08:01:32 serassio Exp $
+ * $Id: ACLDestinationDomain.cc,v 1.3.4.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -42,7 +42,7 @@
 #include "ACLDomainData.h"
 #include "HttpRequest.h"
 
-MemPool *ACLDestinationDomain::Pool(NULL);
+MemPool *ACLDestinationDomain::Pool = NULL;
 void *
 ACLDestinationDomain::operator new (size_t byteCount)
 {
Index: squid3/src/ACLDestinationIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLDestinationIP.cc,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- squid3/src/ACLDestinationIP.cc	12 Jul 2003 08:01:32 -0000	1.2.4.1
+++ squid3/src/ACLDestinationIP.cc	13 Jul 2003 13:02:55 -0000	1.2.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLDestinationIP.cc,v 1.2.4.1 2003/07/12 08:01:32 serassio Exp $
+ * $Id: ACLDestinationIP.cc,v 1.2.4.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,7 +38,7 @@
 #include "ACLChecklist.h"
 #include "HttpRequest.h"
 
-MemPool *ACLDestinationIP::Pool(NULL);
+MemPool *ACLDestinationIP::Pool = NULL;
 void *
 ACLDestinationIP::operator new (size_t byteCount)
 {
Index: squid3/src/ACLDomainData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLDomainData.cc,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- squid3/src/ACLDomainData.cc	22 Feb 2003 03:14:29 -0000	1.3
+++ squid3/src/ACLDomainData.cc	13 Jul 2003 13:02:55 -0000	1.3.4.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLDomainData.cc,v 1.3 2003/02/22 03:14:29 squidadm Exp $
+ * $Id: ACLDomainData.cc,v 1.3.4.1 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLDomainData::Pool(NULL);
+MemPool *ACLDomainData::Pool = NULL;
 void *
 ACLDomainData::operator new (size_t byteCount)
 {
Index: squid3/src/ACLExtUser.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLExtUser.cc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid3/src/ACLExtUser.cc	12 Jul 2003 08:01:32 -0000	1.1.2.2
+++ squid3/src/ACLExtUser.cc	13 Jul 2003 13:02:55 -0000	1.1.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLExtUser.cc,v 1.1.2.2 2003/07/12 08:01:32 serassio Exp $
+ * $Id: ACLExtUser.cc,v 1.1.2.3 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -43,7 +43,7 @@
 #include "client_side.h"
 #include "HttpRequest.h"
 
-MemPool *ACLExtUser::Pool(NULL);
+MemPool *ACLExtUser::Pool = NULL;
 void *
 ACLExtUser::operator new (size_t byteCount)
 {
Index: squid3/src/ACLIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLIP.cc,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- squid3/src/ACLIP.cc	22 Feb 2003 03:14:29 -0000	1.3
+++ squid3/src/ACLIP.cc	13 Jul 2003 13:02:55 -0000	1.3.4.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLIP.cc,v 1.3 2003/02/22 03:14:29 squidadm Exp $
+ * $Id: ACLIP.cc,v 1.3.4.1 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -368,7 +368,7 @@
 wordlist *
 ACLIP::dump() const
 {
-    wordlist *w (NULL);
+    wordlist *w = NULL;
     data->walk (DumpIpListWalkee, &w);
     return w;
 }
@@ -399,7 +399,7 @@
     return !splayLastResult;
 }
 
-MemPool *acl_ip_data::Pool(NULL);
+MemPool *acl_ip_data::Pool = NULL;
 void *
 acl_ip_data::operator new (size_t byteCount)
 {
Index: squid3/src/ACLIdent.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLIdent.cc,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -u -r1.4.4.2 -r1.4.4.3
--- squid3/src/ACLIdent.cc	12 Jul 2003 08:01:32 -0000	1.4.4.2
+++ squid3/src/ACLIdent.cc	13 Jul 2003 13:02:55 -0000	1.4.4.3
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLIdent.cc,v 1.4.4.2 2003/07/12 08:01:32 serassio Exp $
+ * $Id: ACLIdent.cc,v 1.4.4.3 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -42,7 +42,7 @@
 #include "ACLUserData.h"
 #include "client_side.h"
 
-MemPool *ACLIdent::Pool(NULL);
+MemPool *ACLIdent::Pool = NULL;
 void *
 ACLIdent::operator new (size_t byteCount)
 {
Index: squid3/src/ACLMaxConnection.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLMaxConnection.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/src/ACLMaxConnection.cc	1 Mar 2003 16:18:29 -0000	1.1.2.1
+++ squid3/src/ACLMaxConnection.cc	13 Jul 2003 13:02:55 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMaxConnection.cc,v 1.1.2.1 2003/03/01 16:18:29 serassio Exp $
+ * $Id: ACLMaxConnection.cc,v 1.1.2.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -53,7 +53,7 @@
 ACLMaxConnection::ACLMaxConnection (ACLMaxConnection const & old) :class_ (old.class_), limit (old.limit)
 {}
 
-MemPool *ACLMaxConnection::Pool(NULL);
+MemPool *ACLMaxConnection::Pool = NULL;
 void *
 ACLMaxConnection::operator new (size_t byteCount)
 {
Index: squid3/src/ACLMaxUserIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLMaxUserIP.cc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid3/src/ACLMaxUserIP.cc	11 Mar 2003 08:26:50 -0000	1.1.2.2
+++ squid3/src/ACLMaxUserIP.cc	13 Jul 2003 13:02:55 -0000	1.1.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMaxUserIP.cc,v 1.1.2.2 2003/03/11 08:26:50 serassio Exp $
+ * $Id: ACLMaxUserIP.cc,v 1.1.2.3 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -54,7 +54,7 @@
 ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) :class_ (old.class_), maximum (old.maximum), flags (old.flags)
 {}
 
-MemPool *ACLMaxUserIP::Pool(NULL);
+MemPool *ACLMaxUserIP::Pool = NULL;
 void *
 ACLMaxUserIP::operator new (size_t byteCount)
 {
Index: squid3/src/ACLMethodData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLMethodData.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/src/ACLMethodData.cc	1 Mar 2003 16:18:29 -0000	1.1.2.1
+++ squid3/src/ACLMethodData.cc	13 Jul 2003 13:02:55 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMethodData.cc,v 1.1.2.1 2003/03/01 16:18:29 serassio Exp $
+ * $Id: ACLMethodData.cc,v 1.1.2.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,7 +38,7 @@
 #include "ACLMethodData.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLMethodData::Pool(NULL);
+MemPool *ACLMethodData::Pool = NULL;
 void *
 ACLMethodData::operator new (size_t byteCount)
 {
Index: squid3/src/ACLMyIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLMyIP.cc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- squid3/src/ACLMyIP.cc	22 Feb 2003 03:14:29 -0000	1.2
+++ squid3/src/ACLMyIP.cc	13 Jul 2003 13:02:55 -0000	1.2.4.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMyIP.cc,v 1.2 2003/02/22 03:14:29 squidadm Exp $
+ * $Id: ACLMyIP.cc,v 1.2.4.1 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -37,7 +37,7 @@
 #include "ACLMyIP.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLMyIP::Pool(NULL);
+MemPool *ACLMyIP::Pool = NULL;
 void *
 ACLMyIP::operator new (size_t byteCount)
 {
Index: squid3/src/ACLProtocolData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLProtocolData.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/src/ACLProtocolData.cc	1 Mar 2003 16:18:29 -0000	1.1.2.1
+++ squid3/src/ACLProtocolData.cc	13 Jul 2003 13:02:55 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLProtocolData.cc,v 1.1.2.1 2003/03/01 16:18:29 serassio Exp $
+ * $Id: ACLProtocolData.cc,v 1.1.2.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,7 +38,7 @@
 #include "ACLProtocolData.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLProtocolData::Pool(NULL);
+MemPool *ACLProtocolData::Pool = NULL;
 void *
 ACLProtocolData::operator new (size_t byteCount)
 {
Index: squid3/src/ACLProxyAuth.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLProxyAuth.cc,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -u -r1.5.4.2 -r1.5.4.3
--- squid3/src/ACLProxyAuth.cc	12 Jul 2003 08:01:32 -0000	1.5.4.2
+++ squid3/src/ACLProxyAuth.cc	13 Jul 2003 13:02:55 -0000	1.5.4.3
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLProxyAuth.cc,v 1.5.4.2 2003/07/12 08:01:32 serassio Exp $
+ * $Id: ACLProxyAuth.cc,v 1.5.4.3 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -43,7 +43,7 @@
 #include "client_side.h"
 #include "HttpRequest.h"
 
-MemPool *ACLProxyAuth::Pool(NULL);
+MemPool *ACLProxyAuth::Pool = NULL;
 void *
 ACLProxyAuth::operator new (size_t byteCount)
 {
Index: squid3/src/ACLRegexData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLRegexData.cc,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- squid3/src/ACLRegexData.cc	1 Mar 2003 16:18:29 -0000	1.3.4.1
+++ squid3/src/ACLRegexData.cc	13 Jul 2003 13:02:55 -0000	1.3.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLRegexData.cc,v 1.3.4.1 2003/03/01 16:18:29 serassio Exp $
+ * $Id: ACLRegexData.cc,v 1.3.4.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -40,7 +40,7 @@
 #include "ACLChecklist.h"
 #include "ACL.h"
 
-MemPool *ACLRegexData::Pool(NULL);
+MemPool *ACLRegexData::Pool = NULL;
 void *
 ACLRegexData::operator new (size_t byteCount)
 {
Index: squid3/src/ACLReplyHeaderStrategy.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLReplyHeaderStrategy.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid3/src/ACLReplyHeaderStrategy.h	21 Jun 2003 07:45:58 -0000	1.1.2.2
+++ squid3/src/ACLReplyHeaderStrategy.h	13 Jul 2003 13:02:55 -0000	1.1.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLReplyHeaderStrategy.h,v 1.1.2.2 2003/06/21 07:45:58 serassio Exp $
+ * $Id: ACLReplyHeaderStrategy.h,v 1.1.2.3 2003/07/13 13:02:55 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -84,6 +84,6 @@
 }
 
 template <http_hdr_type header>
-ACLReplyHeaderStrategy<header> * ACLReplyHeaderStrategy<header>::Instance_(NULL);
+ACLReplyHeaderStrategy<header> * ACLReplyHeaderStrategy<header>::Instance_ = NULL;
 
 #endif /* SQUID_REPLYHEADERSTRATEGY_H */
Index: squid3/src/ACLRequestHeaderStrategy.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLRequestHeaderStrategy.h,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -u -r1.2.4.3 -r1.2.4.4
--- squid3/src/ACLRequestHeaderStrategy.h	12 Jul 2003 08:01:32 -0000	1.2.4.3
+++ squid3/src/ACLRequestHeaderStrategy.h	13 Jul 2003 13:02:55 -0000	1.2.4.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLRequestHeaderStrategy.h,v 1.2.4.3 2003/07/12 08:01:32 serassio Exp $
+ * $Id: ACLRequestHeaderStrategy.h,v 1.2.4.4 2003/07/13 13:02:55 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -85,6 +85,6 @@
 }
 
 template <http_hdr_type header>
-ACLRequestHeaderStrategy<header> * ACLRequestHeaderStrategy<header>::Instance_ (NULL);
+ACLRequestHeaderStrategy<header> * ACLRequestHeaderStrategy<header>::Instance_ = NULL;
 
 #endif /* SQUID_REQUESTHEADERSTRATEGY_H */
Index: squid3/src/ACLSourceIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLSourceIP.cc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- squid3/src/ACLSourceIP.cc	22 Feb 2003 03:14:29 -0000	1.2
+++ squid3/src/ACLSourceIP.cc	13 Jul 2003 13:02:55 -0000	1.2.4.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLSourceIP.cc,v 1.2 2003/02/22 03:14:29 squidadm Exp $
+ * $Id: ACLSourceIP.cc,v 1.2.4.1 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -37,7 +37,7 @@
 #include "ACLSourceIP.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLSourceIP::Pool(NULL);
+MemPool *ACLSourceIP::Pool = NULL;
 void *
 ACLSourceIP::operator new (size_t byteCount)
 {
Index: squid3/src/ACLStrategised.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLStrategised.h,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -u -r1.2.4.1 -r1.2.4.2
--- squid3/src/ACLStrategised.h	1 Mar 2003 16:18:29 -0000	1.2.4.1
+++ squid3/src/ACLStrategised.h	13 Jul 2003 13:02:55 -0000	1.2.4.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLStrategised.h,v 1.2.4.1 2003/03/01 16:18:29 serassio Exp $
+ * $Id: ACLStrategised.h,v 1.2.4.2 2003/07/13 13:02:55 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -77,7 +77,7 @@
 /* implementation follows */
 
 template <class MatchType>
-MemPool *ACLStrategised<MatchType>::Pool(NULL);
+MemPool *ACLStrategised<MatchType>::Pool = NULL;
 
 template <class MatchType>
 void *
Index: squid3/src/ACLStringData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLStringData.cc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid3/src/ACLStringData.cc	1 Mar 2003 16:18:30 -0000	1.1.2.1
+++ squid3/src/ACLStringData.cc	13 Jul 2003 13:02:55 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLStringData.cc,v 1.1.2.1 2003/03/01 16:18:30 serassio Exp $
+ * $Id: ACLStringData.cc,v 1.1.2.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,7 +38,7 @@
 #include "ACLStringData.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLStringData::Pool(NULL);
+MemPool *ACLStringData::Pool = NULL;
 void *
 ACLStringData::operator new (size_t byteCount)
 {
Index: squid3/src/ACLTimeData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLTimeData.cc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- squid3/src/ACLTimeData.cc	22 Feb 2003 03:14:29 -0000	1.2
+++ squid3/src/ACLTimeData.cc	13 Jul 2003 13:02:55 -0000	1.2.4.1
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLTimeData.cc,v 1.2 2003/02/22 03:14:29 squidadm Exp $
+ * $Id: ACLTimeData.cc,v 1.2.4.1 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLTimeData::Pool(NULL);
+MemPool *ACLTimeData::Pool = NULL;
 void *
 ACLTimeData::operator new (size_t byteCount)
 {
Index: squid3/src/ACLUserData.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLUserData.cc,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- squid3/src/ACLUserData.cc	7 May 2003 19:03:27 -0000	1.5.4.1
+++ squid3/src/ACLUserData.cc	13 Jul 2003 13:02:55 -0000	1.5.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLUserData.cc,v 1.5.4.1 2003/05/07 19:03:27 serassio Exp $
+ * $Id: ACLUserData.cc,v 1.5.4.2 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLUserData::Pool(NULL);
+MemPool *ACLUserData::Pool = NULL;
 void *
 ACLUserData::operator new (size_t byteCount)
 {
Index: squid3/src/ESIElement.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ESIElement.h,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -r1.1.6.1 -r1.1.6.2
--- squid3/src/ESIElement.h	11 Mar 2003 08:26:52 -0000	1.1.6.1
+++ squid3/src/ESIElement.h	13 Jul 2003 13:02:55 -0000	1.1.6.2
@@ -1,5 +1,5 @@
 /*
- * $Id: ESIElement.h,v 1.1.6.1 2003/03/11 08:26:52 serassio Exp $
+ * $Id: ESIElement.h,v 1.1.6.2 2003/07/13 13:02:55 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -63,7 +63,7 @@
 
 class esiVarState;
 
-struct ESIElement : public esiTreeParent
+class ESIElement : public esiTreeParent
 {
     typedef RefCount<ESIElement> Pointer;
 
Index: squid3/src/HttpHeader.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/HttpHeader.cc,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- squid3/src/HttpHeader.cc	12 Jul 2003 08:01:32 -0000	1.6.2.4
+++ squid3/src/HttpHeader.cc	13 Jul 2003 13:02:55 -0000	1.6.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeader.cc,v 1.6.2.4 2003/07/12 08:01:32 serassio Exp $
+ * $Id: HttpHeader.cc,v 1.6.2.5 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
@@ -1452,7 +1452,7 @@
     return HeadersAttrs[id].name;
 }
 
-MemPool *HttpHeaderEntry::Pool(NULL);
+MemPool *HttpHeaderEntry::Pool = NULL;
 void *
 HttpHeaderEntry::operator new (size_t byteCount)
 {
Index: squid3/src/HttpReply.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/HttpReply.cc,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- squid3/src/HttpReply.cc	12 May 2003 08:43:50 -0000	1.7.2.5
+++ squid3/src/HttpReply.cc	13 Jul 2003 13:02:55 -0000	1.7.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpReply.cc,v 1.7.2.5 2003/05/12 08:43:50 serassio Exp $
+ * $Id: HttpReply.cc,v 1.7.2.6 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 58    HTTP Reply (Response)
  * AUTHOR: Alex Rousskov
@@ -599,7 +599,7 @@
     return reply->content_length;
 }
 
-MemPool *HttpReply::Pool(NULL);
+MemPool *HttpReply::Pool = NULL;
 void *
 HttpReply::operator new (size_t byteCount)
 {
Index: squid3/src/SwapDir.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/SwapDir.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- squid3/src/SwapDir.h	8 Mar 2003 10:17:23 -0000	1.4.2.1
+++ squid3/src/SwapDir.h	13 Jul 2003 13:02:55 -0000	1.4.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: SwapDir.h,v 1.4.2.1 2003/03/08 10:17:23 serassio Exp $
+ * $Id: SwapDir.h,v 1.4.2.2 2003/07/13 13:02:55 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -42,7 +42,7 @@
 typedef void STFSSHUTDOWN(void);
 typedef SwapDir *STFSNEW(void);
 
-struct SwapDir
+class SwapDir
 {
 
 public:
Index: squid3/src/acl.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/acl.cc,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -r1.15.2.2 -r1.15.2.3
--- squid3/src/acl.cc	17 May 2003 18:35:19 -0000	1.15.2.2
+++ squid3/src/acl.cc	13 Jul 2003 13:02:55 -0000	1.15.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.15.2.2 2003/05/17 18:35:19 serassio Exp $
+ * $Id: acl.cc,v 1.15.2.3 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -668,7 +668,7 @@
 
 /* to be split into separate files in the future */
 
-MemPool *ACLList::Pool(NULL);
+MemPool *ACLList::Pool = NULL;
 void *
 ACLList::operator new (size_t byteCount)
 {
Index: squid3/src/asn.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/asn.cc,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- squid3/src/asn.cc	21 Jun 2003 07:45:58 -0000	1.8.2.3
+++ squid3/src/asn.cc	13 Jul 2003 13:02:55 -0000	1.8.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: asn.cc,v 1.8.2.3 2003/06/21 07:45:58 serassio Exp $
+ * $Id: asn.cc,v 1.8.2.4 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -547,7 +547,7 @@
     return 0;
 }
 
-MemPool *ACLASN::Pool(NULL);
+MemPool *ACLASN::Pool = NULL;
 void *
 ACLASN::operator new (size_t byteCount)
 {
Index: squid3/src/comm.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/comm.cc,v
retrieving revision 1.19.2.11
retrieving revision 1.19.2.12
diff -u -r1.19.2.11 -r1.19.2.12
--- squid3/src/comm.cc	12 Jul 2003 08:01:35 -0000	1.19.2.11
+++ squid3/src/comm.cc	13 Jul 2003 13:02:55 -0000	1.19.2.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.19.2.11 2003/07/12 08:01:35 serassio Exp $
+ * $Id: comm.cc,v 1.19.2.12 2003/07/13 13:02:55 serassio Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -317,7 +317,7 @@
 
 /* New and improved stuff */
 
-MemPool *CommCallbackData::Pool(NULL);
+MemPool *CommCallbackData::Pool = NULL;
 void *
 CommCallbackData::operator new (size_t byteCount)
 {
@@ -342,7 +342,7 @@
     delete this;
 }
 
-MemPool *CommReadCallbackData::Pool(NULL);
+MemPool *CommReadCallbackData::Pool = NULL;
 void *
 CommReadCallbackData::operator new (size_t byteCount)
 {
@@ -367,7 +367,7 @@
     delete this;
 }
 
-MemPool *CommAcceptCallbackData::Pool(NULL);
+MemPool *CommAcceptCallbackData::Pool = NULL;
 void *
 CommAcceptCallbackData::operator new (size_t byteCount)
 {
@@ -392,7 +392,7 @@
     delete this;
 }
 
-MemPool *CommFillCallbackData::Pool(NULL);
+MemPool *CommFillCallbackData::Pool = NULL;
 void *
 CommFillCallbackData::operator new (size_t byteCount)
 {
@@ -418,7 +418,7 @@
 }
 
 
-MemPool *CommWriteCallbackData::Pool(NULL);
+MemPool *CommWriteCallbackData::Pool = NULL;
 void *
 CommWriteCallbackData::operator new (size_t byteCount)
 {
Index: squid3/src/errorpage.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/errorpage.cc,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -u -r1.11.2.6 -r1.11.2.7
--- squid3/src/errorpage.cc	12 Jul 2003 08:01:35 -0000	1.11.2.6
+++ squid3/src/errorpage.cc	13 Jul 2003 13:02:56 -0000	1.11.2.7
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.11.2.6 2003/07/12 08:01:35 serassio Exp $
+ * $Id: errorpage.cc,v 1.11.2.7 2003/07/13 13:02:56 serassio Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -270,14 +270,18 @@
 static int
 errorPageId(const char *page_name)
 {
-    for (int i = 0; i < ERR_MAX; i++) {
-        if (strcmp(err_type_str[i], page_name) == 0)
-            return i;
+    {
+        for (int i = 0; i < ERR_MAX; i++) {
+            if (strcmp(err_type_str[i], page_name) == 0)
+                return i;
+        }
     }
-
-    for (size_t i = 0; i < ErrorDynamicPages.size(); i++) {
-        if (strcmp(ErrorDynamicPages.items[i]->page_name, page_name) == 0)
-            return i + ERR_MAX;
+    
+    {
+        for (size_t i = 0; i < ErrorDynamicPages.size(); i++) {
+            if (strcmp(ErrorDynamicPages.items[i]->page_name, page_name) == 0)
+                return i + ERR_MAX;
+        }
     }
 
     return ERR_NONE;
Index: squid3/src/external_acl.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/external_acl.cc,v
retrieving revision 1.14.2.14
retrieving revision 1.14.2.15
diff -u -r1.14.2.14 -r1.14.2.15
--- squid3/src/external_acl.cc	12 Jul 2003 08:01:35 -0000	1.14.2.14
+++ squid3/src/external_acl.cc	13 Jul 2003 13:02:56 -0000	1.14.2.15
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.14.2.14 2003/07/12 08:01:35 serassio Exp $
+ * $Id: external_acl.cc,v 1.14.2.15 2003/07/13 13:02:56 serassio Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -1232,7 +1232,7 @@
     assert (!old.data);
 }
 
-MemPool *ACLExternal::Pool(NULL);
+MemPool *ACLExternal::Pool = NULL;
 void *
 ACLExternal::operator new (size_t byteCount)
 {
Index: squid3/src/auth/digest/auth_digest.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/auth/digest/auth_digest.cc,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- squid3/src/auth/digest/auth_digest.cc	12 Jul 2003 08:01:37 -0000	1.6.2.4
+++ squid3/src/auth/digest/auth_digest.cc	13 Jul 2003 12:59:55 -0000	1.6.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_digest.cc,v 1.6.2.4 2003/07/12 08:01:37 serassio Exp $
+ * $Id: auth_digest.cc,v 1.6.2.5 2003/07/13 12:59:55 serassio Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Robert Collins
@@ -784,7 +784,7 @@
             || (accel && rep->sline.status == HTTP_UNAUTHORIZED))
         return;
 
-    type = accel ? HDR_AUTHENTICATION_INFO : HDR_PROXY_AUTHENTICATION_INFO;
+    type = (http_hdr_type) (accel ? HDR_AUTHENTICATION_INFO : HDR_PROXY_AUTHENTICATION_INFO);
 
 #if WAITING_FOR_TE
     /* test for http/1.1 transfer chunked encoding */
@@ -796,7 +796,7 @@
     if ((digestConfig->authenticate) && authDigestNonceLastRequest(nonce)) {
         flags.authinfo_sent = 1;
         debug(29, 9) ("authDigestAddHead: Sending type:%d header: 'nextnonce=\"%s\"", type, authenticateDigestNonceNonceb64(nonce));
-        httpHeaderPutStrf(&rep->header, type, "nextnonce=\"%s\"", authenticateDigestNonceNonceb64(nonce));
+//        httpHeaderPutStrf(&rep->header, type, "nextnonce=\"%s\"", authenticateDigestNonceNonceb64(nonce));
     }
 }
 
@@ -1510,7 +1510,7 @@
 }
 
 
-MemPool *digest_user_h::Pool(NULL);
+MemPool *digest_user_h::Pool = NULL;
 void *
 digest_user_h::operator new (size_t byteCount)
 {
@@ -1538,7 +1538,7 @@
 digest_user_h::digest_user_h () : username (NULL), HA1created (0)
 {}
 
-MemPool *digest_request_h::Pool(NULL);
+MemPool *digest_request_h::Pool = NULL;
 void *
 digest_request_h::operator new (size_t byteCount)
 {
Index: squid3/src/auth/ntlm/auth_ntlm.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/auth/ntlm/auth_ntlm.cc,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- squid3/src/auth/ntlm/auth_ntlm.cc	12 Jul 2003 08:01:37 -0000	1.6.2.4
+++ squid3/src/auth/ntlm/auth_ntlm.cc	13 Jul 2003 12:59:55 -0000	1.6.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.6.2.4 2003/07/12 08:01:37 serassio Exp $
+ * $Id: auth_ntlm.cc,v 1.6.2.5 2003/07/13 12:59:55 serassio Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins
@@ -1236,7 +1236,8 @@
     return;
 }
 
-MemPool *ntlm_request_t::Pool(NULL);
+MemPool *ntlm_request_t::Pool = NULL;
+
 void *
 ntlm_request_t::operator new (size_t byteCount)
 {
Index: squid3/src/fs/ufs/store_io_ufs.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/store_io_ufs.cc,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- squid3/src/fs/ufs/store_io_ufs.cc	8 Mar 2003 10:17:24 -0000	1.7.2.1
+++ squid3/src/fs/ufs/store_io_ufs.cc	13 Jul 2003 13:00:09 -0000	1.7.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_io_ufs.cc,v 1.7.2.1 2003/03/08 10:17:24 serassio Exp $
+ * $Id: store_io_ufs.cc,v 1.7.2.2 2003/07/13 13:00:09 serassio Exp $
  *
  * DEBUG: section 79    Storage Manager UFS Interface
  * AUTHOR: Duane Wessels
@@ -432,9 +432,9 @@
         delete qr;
     }
 
-    struct _queued_write *qw;
+    class _queued_write *qw;
 
-    while ((qw = (struct _queued_write *)linklistShift(&pending_writes))) {
+    while ((qw = (class _queued_write *)linklistShift(&pending_writes))) {
         if (qw->free_func)
             qw->free_func(const_cast<char *>(qw->buf));
         delete qw;
@@ -532,7 +532,7 @@
 {
     debug(79, 3) ("UFSStoreState::queueWrite: queuing write\n");
 
-    struct _queued_write *q;
+    class _queued_write *q;
     q = new _queued_write;
     q->buf = buf;
     q->size = size;