@SET_MAKE@
#
-# $Id: Makefile.in,v 1.66 2004/12/21 15:16:16 robertc Exp $
+# $Id: Makefile.in,v 1.67 2004/12/21 17:28:27 robertc Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
/*
- * $Id: config.h,v 1.14 2004/12/21 16:17:58 hno Exp $
+ * $Id: config.h,v 1.15 2004/12/21 17:28:27 robertc Exp $
*
* AUTHOR: Duane Wessels
*
/*
- * $Id: Profiler.c,v 1.4 2004/12/21 16:17:58 hno Exp $
+ * $Id: Profiler.c,v 1.5 2004/12/21 17:28:28 robertc Exp $
*
* DEBUG: section 81 CPU Profiling Routines
* AUTHOR: Andres Kroonmaa, Sep.2000
void testNumberOfPieces()
{
- CPPUNIT_ASSERT( m_game->getNumberOfPieces () == 32 );
+ CPPUNIT_ASSERT( this->m_game->getNumberOfPieces () == 32 );
}
};
@SET_MAKE@
#
-# $Id: Makefile.in,v 1.4 2004/12/21 15:16:18 robertc Exp $
+# $Id: Makefile.in,v 1.5 2004/12/21 17:28:28 robertc Exp $
#
SOURCES = $(libcppunit_la_SOURCES)
/*
- * $Id: hash.c,v 1.16 2004/12/21 16:17:58 hno Exp $
+ * $Id: hash.c,v 1.17 2004/12/21 17:28:28 robertc Exp $
*
* DEBUG: section 0 Hash Tables
* AUTHOR: Harvest Derived
#ifndef __cplusplus
/* TODO: provide parameterisation for C bindings */
-void *TrieCreate ();
+void *TrieCreate (void);
void TrieDestroy (void *);
void *TrieFind (void *, char const *, size_t);
int TrieAdd (void *, char const *, size_t, void *);
/*
- * $Id: radix.c,v 1.21 2004/12/21 16:17:58 hno Exp $
+ * $Id: radix.c,v 1.22 2004/12/21 17:28:28 robertc Exp $
*
* DEBUG: section 53 Radix tree data structure implementation
* AUTHOR: NetBSD Derived
/*
- * $Id: util.c,v 1.91 2004/12/21 16:17:58 hno Exp $
+ * $Id: util.c,v 1.92 2004/12/21 17:28:28 robertc Exp $
*
* DEBUG:
* AUTHOR: Harvest Derived
/*
- * $Id: ACLChecklist.cc,v 1.22 2004/12/20 17:35:58 robertc Exp $
+ * $Id: ACLChecklist.cc,v 1.23 2004/12/21 17:28:28 robertc Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
assert (size == sizeof(ACLChecklist));
CBDATA_INIT_TYPE(ACLChecklist);
ACLChecklist *result = cbdataAlloc(ACLChecklist);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- return cbdataReference(result);
+ return result;
}
void
ACLChecklist::operator delete (void *address)
{
ACLChecklist *t = static_cast<ACLChecklist *>(address);
- cbdataFree(address);
- /* And allow the memory to be freed */
- cbdataReferenceDone (t);
+ cbdataFree(t);
}
ACLChecklist::ACLChecklist() : accessList (NULL), my_port (0), request (NULL),
/*
- * $Id: BlockingFile.cc,v 1.1 2004/12/20 16:30:38 robertc Exp $
+ * $Id: BlockingFile.cc,v 1.2 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 47 Store Directory Routines
* AUTHOR: Robert Collins
BlockingFile *result = cbdataAlloc(BlockingFile);
/* Mark result as being owned - we want the refcounter to do the delete
* call */
- cbdataReference(result);
return result;
}
BlockingFile::operator delete (void *address)
{
BlockingFile *t = static_cast<BlockingFile *>(address);
- cbdataFree(address);
- /* And allow the memory to be freed */
- cbdataReferenceDone (t);
+ cbdataFree(t);
}
BlockingFile::BlockingFile (char const *aPath) : fd (-1), closed (true), error_(false)
/*
- * $Id: DiskdFile.cc,v 1.1 2004/12/20 16:30:38 robertc Exp $
+ * $Id: DiskdFile.cc,v 1.2 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 79 Squid-side DISKD I/O functions.
* AUTHOR: Duane Wessels
DiskdFile *result = cbdataAlloc(DiskdFile);
/* Mark result as being owned - we want the refcounter to do the delete
* call */
- cbdataReference(result);
debug (79,3)("diskdFile with base %p allocating\n", result);
return result;
}
void
DiskdFile::operator delete (void *address)
{
- debug (79,3)("diskdFile with base %p deleting\n",address);
DiskdFile *t = static_cast<DiskdFile *>(address);
- cbdataFree(address);
- /* And allow the memory to be freed */
- cbdataReferenceDone (t);
+ debug (79,3)("diskdFile with base %p deleting\n",t);
+ cbdataFree(t);
}
DiskdFile::DiskdFile (char const *aPath, DiskdIOStrategy *anIO) : errorOccured (false), IO(anIO),
/*
- * $Id: DiskThreadsDiskFile.cc,v 1.1 2004/12/20 16:30:38 robertc Exp $
+ * $Id: DiskThreadsDiskFile.cc,v 1.2 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 79 Disk IO Routines
* AUTHOR: Robert Collins
{
CBDATA_INIT_TYPE(DiskThreadsDiskFile);
DiskThreadsDiskFile *result = cbdataAlloc(DiskThreadsDiskFile);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- return cbdataReference(result);
+ return result;
}
void
DiskThreadsDiskFile::operator delete (void *address)
{
DiskThreadsDiskFile *t = static_cast<DiskThreadsDiskFile *>(address);
- cbdataFree(address);
- /* And allow the memory to be freed */
- cbdataReferenceDone (t);
+ cbdataFree(t);
}
DiskThreadsDiskFile::DiskThreadsDiskFile (char const *aPath, DiskThreadsIOStrategy *anIO):fd(-1), errorOccured (false), IO(anIO),
/*
- * $Id: ESI.cc,v 1.11 2004/12/20 16:30:32 robertc Exp $
+ * $Id: ESI.cc,v 1.12 2004/12/21 17:28:28 robertc Exp $
*
* DEBUG: section 86 ESI processing
* AUTHOR: Robert Collins
assert (byteCount == sizeof (ESIContext));
CBDATA_INIT_TYPE(ESIContext);
ESIContext *result = cbdataAlloc(ESIContext);
- /* Mark result as being owned - we want the refcounter to do the
- * delete call
- */
- cbdataReference(result);
return result;
}
{
ESIContext *t = static_cast<ESIContext *>(address);
cbdataFree(t);
- /* And allow the memory to be freed */
- cbdataReferenceDone (address);
}
void
/* TODO: skip data until pos == next->readoff; */
assert (thisNode->data == this);
clientStreamNode *next = thisNode->next();
- cbdataReference (this);
+ ESIContext *templock = cbdataReference (this);
size_t len = 0;
if (outbound.getRaw())
if (len == 0)
len = 1; /* tell the caller we sent something (because we sent headers */
- ESIContext *temp = this;
- cbdataReferenceDone (temp);
+ cbdataReferenceDone (templock);
debug (86,5)("ESIContext::send: this=%p sent %d\n",this,len);
/*
- * $Id: ESIInclude.cc,v 1.4 2004/08/30 05:12:31 robertc Exp $
+ * $Id: ESIInclude.cc,v 1.5 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 86 ESI processing
* AUTHOR: Robert Collins
assert (byteCount == sizeof (ESIStreamContext));
CBDATA_INIT_TYPE(ESIStreamContext);
ESIStreamContext *result = cbdataAlloc(ESIStreamContext);
- /* Mark result as being owned - we want the refcounter to do the
- * delete call
- */
- cbdataReference(result);
return result;
}
{
ESIStreamContext *t = static_cast<ESIStreamContext *>(address);
cbdataFree(t);
- /* And allow the memory to be freed */
- cbdataReferenceDone (address);
}
ESIStreamContext *
/*
- * $Id: IPInterception.cc,v 1.8 2004/12/21 16:17:59 hno Exp $
+ * $Id: IPInterception.cc,v 1.9 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 89 NAT / IP Interception
* AUTHOR: Robert Collins
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.am,v 1.100 2004/12/20 18:14:31 robertc Exp $
+# $Id: Makefile.am,v 1.101 2004/12/21 17:28:29 robertc Exp $
#
# Uncomment and customize the following to suit your needs:
#
tests_testAuth_LDADD= \
@AUTH_LINKOBJS@ @AUTH_OBJS@ \
-L../lib -lmiscutil \
- @SQUID_CPPUNIT_LA@
+ @SQUID_CPPUNIT_LA@ \
+ @SSLLIB@
tests_testAuth_LDFLAGS = $(LIBADD_DL)
tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
@AUTH_LINKOBJS@ \
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.331 2004/12/20 18:14:31 robertc Exp $
+# $Id: Makefile.in,v 1.332 2004/12/21 17:28:29 robertc Exp $
#
# Uncomment and customize the following to suit your needs:
#
tests_testAuth_LDADD = \
@AUTH_LINKOBJS@ @AUTH_OBJS@ \
-L../lib -lmiscutil \
- @SQUID_CPPUNIT_LA@
+ @SQUID_CPPUNIT_LA@ \
+ @SSLLIB@
tests_testAuth_LDFLAGS = $(LIBADD_DL)
tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
/*
- * $Id: cachemgr.cc,v 1.106 2004/12/21 16:17:59 hno Exp $
+ * $Id: cachemgr.cc,v 1.107 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 0 CGI Cache Manager
* AUTHOR: Duane Wessels
/*
- * $Id: client_side_request.cc,v 1.42 2004/12/20 16:30:35 robertc Exp $
+ * $Id: client_side_request.cc,v 1.43 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 85 Client-side Request Routines
* AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
assert (size == sizeof(ClientRequestContext));
CBDATA_INIT_TYPE(ClientRequestContext);
ClientRequestContext *result = cbdataAlloc(ClientRequestContext);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- return cbdataReference(result);
+ return result;
}
void
ClientRequestContext::operator delete (void *address)
{
ClientRequestContext *t = static_cast<ClientRequestContext *>(address);
- cbdataFree(address);
- /* And allow the memory to be freed */
- cbdataReferenceDone (t);
+ cbdataFree(t);
}
/* Local functions */
assert (size == sizeof (ClientHttpRequest));
CBDATA_INIT_TYPE(ClientHttpRequest);
ClientHttpRequest *result = cbdataAlloc(ClientHttpRequest);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- return cbdataReference(result);
+ return result;
}
void
ClientHttpRequest::operator delete (void *address)
{
- ClientHttpRequest *temp = static_cast<ClientHttpRequest *>(address);
- cbdataFree(address);
- /* And allow the memory to be freed */
- cbdataReferenceDone (temp);
+ ClientHttpRequest *t = static_cast<ClientHttpRequest *>(address);
+ cbdataFree(t);
}
ClientHttpRequest::ClientHttpRequest() : loggingEntry_(NULL)
/*
- * $Id: dnsserver.cc,v 1.68 2004/12/21 16:17:59 hno Exp $
+ * $Id: dnsserver.cc,v 1.69 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 0 DNS Resolver
* AUTHOR: Harvest Derived
/*
- * $Id: StoreFSufs.h,v 1.3 2004/12/20 16:30:45 robertc Exp $
+ * $Id: StoreFSufs.h,v 1.4 2004/12/21 17:28:29 robertc Exp $
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
#include "squid.h"
#include "ufscommon.h"
+#include "DiskIO/DiskIOModule.h"
-class DiskIOModule;
template <class TheSwapDir>
/*
- * $Id: ufscommon.cc,v 1.1 2004/12/20 16:30:45 robertc Exp $
+ * $Id: ufscommon.cc,v 1.2 2004/12/21 17:28:30 robertc Exp $
*
* DEBUG: section 47 Store Directory Routines
* AUTHOR: Robert Collins
assert (size == sizeof(RebuildState));
CBDATA_INIT_TYPE(RebuildState);
RebuildState *result = cbdataAlloc(RebuildState);
- /* Mark result as being owned - we want the refcounter to do the delete
- * call */
- return cbdataReference(result);
+ return result;
}
void
RebuildState::operator delete (void *address)
{
RebuildState *t = static_cast<RebuildState *>(address);
- cbdataFree(address);
- /* And allow the memory to be freed */
- cbdataReferenceDone (t);
+ cbdataFree(t);
}
RebuildState::~RebuildState()
/*
- * $Id: main.cc,v 1.397 2004/12/21 16:18:00 hno Exp $
+ * $Id: main.cc,v 1.398 2004/12/21 17:28:29 robertc Exp $
*
* DEBUG: section 1 Startup and Main Loop
* AUTHOR: Harvest Derived
/*
- * $Id: squid.h,v 1.242 2004/12/21 16:18:00 hno Exp $
+ * $Id: squid.h,v 1.243 2004/12/21 17:28:29 robertc Exp $
*
* AUTHOR: Duane Wessels
*
#include "config.h"
-#include "testAuth.h"
#include "squid.h"
+#include "testAuth.h"
#include "authenticate.h"
#include "AuthUserRequest.h"
#include "AuthScheme.h"