cosmetic: Remove silly "typedef class ClientHttpRequest clientHttpRequest"

and rename clientHttpRequest to ClientHttpRequest everywhere.

diff --git a/src/DelayId.cc b/src/DelayId.cc
index 9a384a3b59d0d0387848f26461cef8027d6f8274..d965d6ce4b24d0e5f4608dce64ec57c8b9d03ae8 100644 (file)
--- a/src/DelayId.cc
+++ b/src/DelayId.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayId.cc,v 1.16 2005/06/09 16:04:30 serassio Exp $
+ * $Id: DelayId.cc,v 1.17 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -91,7 +91,7 @@ DelayId::operator bool() const
 
 /* create a delay Id for a given request */
 DelayId
-DelayId::DelayClient(clientHttpRequest * http)
+DelayId::DelayClient(ClientHttpRequest * http)
 {
     HttpRequest *r;
     unsigned short pool;

diff --git a/src/ESI.cc b/src/ESI.cc
index d6cf85c013f79efb48d7656beab4f811661a68cc..d69b26e098949b016a9daef39c77eeb0738adc9b 100644 (file)
--- a/src/ESI.cc
+++ b/src/ESI.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESI.cc,v 1.16 2005/09/01 18:53:51 serassio Exp $
+ * $Id: ESI.cc,v 1.17 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -282,7 +282,7 @@ ESIStreamContext::ESIStreamContext() : finished(false), include (NULL), localbuf
 
 /* Local functions */
 /* ESIContext */
-static ESIContext *ESIContextNew(HttpReply *, clientStreamNode *, clientHttpRequest *);
+static ESIContext *ESIContextNew(HttpReply *, clientStreamNode *, ClientHttpRequest *);
 
 
 void *
@@ -431,7 +431,7 @@ ESIContext::kick ()
 /* request from downstream for more data
  */
 void
-esiStreamRead (clientStreamNode *thisNode, clientHttpRequest *http)
+esiStreamRead (clientStreamNode *thisNode, ClientHttpRequest *http)
 {
     clientStreamNode *next;
     /* Test preconditions */
@@ -525,7 +525,7 @@ esiStreamRead (clientStreamNode *thisNode, clientHttpRequest *http)
 }
 
 clientStream_status_t
-esiStreamStatus (clientStreamNode *thisNode, clientHttpRequest *http)
+esiStreamStatus (clientStreamNode *thisNode, ClientHttpRequest *http)
 {
     /* Test preconditions */
     assert (thisNode != NULL);
@@ -704,7 +704,7 @@ ESIContext::finishChildren()
 
 /* Detach event from a client Stream */
 void
-esiStreamDetach (clientStreamNode *thisNode, clientHttpRequest *http)
+esiStreamDetach (clientStreamNode *thisNode, ClientHttpRequest *http)
 {
     /* if we have pending callbacks, tell them we're done. */
     /* test preconditions */
@@ -738,7 +738,7 @@ esiStreamDetach (clientStreamNode *thisNode, clientHttpRequest *http)
  *   There is context data or a reply structure
  */
 void
-esiProcessStream (clientStreamNode *thisNode, clientHttpRequest *http, HttpReply *rep, StoreIOBuffer recievedData)
+esiProcessStream (clientStreamNode *thisNode, ClientHttpRequest *http, HttpReply *rep, StoreIOBuffer recievedData)
 {
     /* test preconditions */
     assert (thisNode != NULL);
@@ -886,7 +886,7 @@ ESIContext::~ESIContext()
 }
 
 ESIContext *
-ESIContextNew (HttpReply *rep, clientStreamNode *thisNode, clientHttpRequest *http)
+ESIContextNew (HttpReply *rep, clientStreamNode *thisNode, ClientHttpRequest *http)
 {
     assert (rep);
     ESIContext *rv = new ESIContext;

diff --git a/src/ESIInclude.cc b/src/ESIInclude.cc
index b07b60a3b0a875107157d18234e4ec511a6d9378..4c6320ddc763739da795bd38e176500274f01335 100644 (file)
--- a/src/ESIInclude.cc
+++ b/src/ESIInclude.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIInclude.cc,v 1.6 2005/07/03 15:25:08 serassio Exp $
+ * $Id: ESIInclude.cc,v 1.7 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -55,7 +55,7 @@ static ESIStreamContext *ESIStreamContextNew (ESIIncludePtr);
 /* Detach from a buffering stream
  */
 void
-esiBufferDetach (clientStreamNode *node, clientHttpRequest *http)
+esiBufferDetach (clientStreamNode *node, ClientHttpRequest *http)
 {
     /* Detach ourselves */
     clientStreamDetach (node, http);
@@ -71,7 +71,7 @@ esiBufferDetach (clientStreamNode *node, clientHttpRequest *http)
  *   There are no more entries in the stream chain.
  */
 void
-esiBufferRecipient (clientStreamNode *node, clientHttpRequest *http, HttpReply *rep, StoreIOBuffer recievedData)
+esiBufferRecipient (clientStreamNode *node, ClientHttpRequest *http, HttpReply *rep, StoreIOBuffer recievedData)
 {
     /* Test preconditions */
     assert (node != NULL);

diff --git a/src/clientStream.cc b/src/clientStream.cc
index b8969cbc425d2d37f373369826332231a20cc84b..21fd010c4dbf0f4c3e4427e19c2e5fb93a1c2bcc 100644 (file)
--- a/src/clientStream.cc
+++ b/src/clientStream.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: clientStream.cc,v 1.11 2004/12/20 16:30:35 robertc Exp $
+ * $Id: clientStream.cc,v 1.12 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 87    Client-side Stream routines.
  * AUTHOR: Robert Collins
@@ -170,7 +170,7 @@ clientStreamInsertHead(dlink_list * list, CSR * func, CSCB * callback,
  * Callback the next node the in chain with it's requested data
  */
 void
-clientStreamCallback(clientStreamNode * thisObject, clientHttpRequest * http,
+clientStreamCallback(clientStreamNode * thisObject, ClientHttpRequest * http,
                      HttpReply * rep, StoreIOBuffer replyBuffer)
 {
     clientStreamNode *next;
@@ -187,7 +187,7 @@ clientStreamCallback(clientStreamNode * thisObject, clientHttpRequest * http,
  * Call the previous node in the chain to read some data
  */
 void
-clientStreamRead(clientStreamNode * thisObject, clientHttpRequest * http,
+clientStreamRead(clientStreamNode * thisObject, ClientHttpRequest * http,
                  StoreIOBuffer readBuffer)
 {
     /* place the parameters on the 'stack' */
@@ -205,7 +205,7 @@ clientStreamRead(clientStreamNode * thisObject, clientHttpRequest * http,
  * Detach from the stream - only allowed for terminal members
  */
 void
-clientStreamDetach(clientStreamNode * thisObject, clientHttpRequest * http)
+clientStreamDetach(clientStreamNode * thisObject, ClientHttpRequest * http)
 {
     clientStreamNode *temp = thisObject;
 
@@ -245,7 +245,7 @@ clientStreamDetach(clientStreamNode * thisObject, clientHttpRequest * http)
  * Abort the stream - detach every node in the pipeline.
  */
 void
-clientStreamAbort(clientStreamNode * thisObject, clientHttpRequest * http)
+clientStreamAbort(clientStreamNode * thisObject, ClientHttpRequest * http)
 {
     dlink_list *list;
 
@@ -264,7 +264,7 @@ clientStreamAbort(clientStreamNode * thisObject, clientHttpRequest * http)
  * Call the upstream node to find it's status 
  */
 clientStream_status_t
-clientStreamStatus(clientStreamNode * thisObject, clientHttpRequest * http)
+clientStreamStatus(clientStreamNode * thisObject, ClientHttpRequest * http)
 {
     clientStreamNode *prev;
     assert(thisObject && http && thisObject->node.prev);

diff --git a/src/client_side.cc b/src/client_side.cc
index 4dd6abac3765340c480785f34ef0da3711932cde..5098eb01c5b27b56203901500c73d81435d3e1bf 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.690 2005/08/31 19:15:35 wessels Exp $
+ * $Id: client_side.cc,v 1.691 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -88,7 +88,7 @@
  * data, or sending it.
  *
  * ClientKeepAliveNextRequest will then detect the presence of data in 
- * the next clientHttpRequest, and will send it, restablishing the 
+ * the next ClientHttpRequest, and will send it, restablishing the 
  * data flow.
  */
 
@@ -114,7 +114,7 @@ ClientSocketContext::operator delete (void *address)
 
 /* Local functions */
 /* ClientSocketContext */
-static ClientSocketContext *ClientSocketContextNew(clientHttpRequest *);
+static ClientSocketContext *ClientSocketContextNew(ClientHttpRequest *);
 /* other */
 static CWCB clientWriteComplete;
 static IOWCB clientWriteBodyComplete;
@@ -133,7 +133,7 @@ static IDCB clientIdentDone;
 #endif
 static CSCB clientSocketRecipient;
 static CSD clientSocketDetach;
-static void clientSetKeepaliveFlag(clientHttpRequest *);
+static void clientSetKeepaliveFlag(ClientHttpRequest *);
 static int clientIsContentLengthValid(HttpRequest * r);
 static bool okToAccept();
 static int clientIsRequestBodyValid(int bodyLength);
@@ -158,7 +158,7 @@ static char *findTrailingHTTPVersion(char *uriAndHTTPVersion);
 static void trimTrailingSpaces(char *aString, size_t len);
 #endif
 static ClientSocketContext *parseURIandHTTPVersion(char **url_p, HttpVersion * http_ver_p, ConnStateData::Pointer& conn, char *http_version_str);
-static void setLogUri(clientHttpRequest * http, char const *uri);
+static void setLogUri(ClientHttpRequest * http, char const *uri);
 static int connReadWasError(ConnStateData::Pointer& conn, comm_err_t, int size, int xerrno);
 static int connFinishedWithConn(ConnStateData::Pointer& conn, int size);
 static void connNoteUseOfBuffer(ConnStateData::Pointer & conn, size_t byteCount);
@@ -299,7 +299,7 @@ ClientSocketContext::ClientSocketContext() : http(NULL), next(NULL),
 }
 
 ClientSocketContext *
-ClientSocketContextNew(clientHttpRequest * http)
+ClientSocketContextNew(ClientHttpRequest * http)
 {
     ClientSocketContext *newContext;
     assert(http != NULL);
@@ -546,7 +546,7 @@ ClientHttpRequest::freeResources()
 void
 httpRequestFree(void *data)
 {
-    clientHttpRequest *http = (clientHttpRequest *)data;
+    ClientHttpRequest *http = (ClientHttpRequest *)data;
     assert(http != NULL);
     delete http;
 }
@@ -633,7 +633,7 @@ ConnStateData::~ConnStateData()
  * to handle hacks for broken servers and clients.
  */
 static void
-clientSetKeepaliveFlag(clientHttpRequest * http)
+clientSetKeepaliveFlag(ClientHttpRequest * http)
 {
     HttpRequest *request = http->request;
     const HttpHeader *req_hdr = &request->header;
@@ -996,7 +996,7 @@ ClientHttpRequest::mRangeCLen()
  * returns true if If-Range specs match reply, false otherwise
  */
 static int
-clientIfRangeMatch(clientHttpRequest * http, HttpReply * rep)
+clientIfRangeMatch(ClientHttpRequest * http, HttpReply * rep)
 {
     const TimeOrTag spec = httpHeaderGetTimeOrTag(&http->request->header, HDR_IF_RANGE);
     /* check for parsing falure */
@@ -1203,7 +1203,7 @@ ClientSocketContext::sendStartOfMessage(HttpReply * rep, StoreIOBuffer bodyData)
  *   There are no more entries in the stream chain.
  */
 static void
-clientSocketRecipient(clientStreamNode * node, clientHttpRequest * http,
+clientSocketRecipient(clientStreamNode * node, ClientHttpRequest * http,
                       HttpReply * rep, StoreIOBuffer recievedData)
 {
     int fd;
@@ -1245,7 +1245,7 @@ clientSocketRecipient(clientStreamNode * node, clientHttpRequest * http,
  * only
  */
 void
-clientSocketDetach(clientStreamNode * node, clientHttpRequest * http)
+clientSocketDetach(clientStreamNode * node, ClientHttpRequest * http)
 {
     /* Test preconditions */
     assert(node != NULL);
@@ -1569,7 +1569,7 @@ extern "C" CSD clientReplyDetach;
 static ClientSocketContext *
 parseHttpRequestAbort(ConnStateData::Pointer & conn, const char *uri)
 {
-    clientHttpRequest *http;
+    ClientHttpRequest *http;
     ClientSocketContext *context;
     StoreIOBuffer tempBuffer;
     http = new ClientHttpRequest;
@@ -1716,7 +1716,7 @@ clientParseHttpRequestLine(char *reqline, ConnStateData::Pointer &conn,
 }
 
 void
-setLogUri(clientHttpRequest * http, char const *uri)
+setLogUri(ClientHttpRequest * http, char const *uri)
 {
     safe_free(http->log_uri);
 
@@ -1727,7 +1727,7 @@ setLogUri(clientHttpRequest * http, char const *uri)
 }
 
 static void
-prepareAcceleratedURL(ConnStateData::Pointer & conn, clientHttpRequest *http, char *url, const char *req_hdr)
+prepareAcceleratedURL(ConnStateData::Pointer & conn, ClientHttpRequest *http, char *url, const char *req_hdr)
 {
     int vhost = conn->port->vhost;
     int vport = conn->port->vport;
@@ -1800,7 +1800,7 @@ prepareAcceleratedURL(ConnStateData::Pointer & conn, clientHttpRequest *http, ch
 }
 
 static void
-prepareTransparentURL(ConnStateData::Pointer & conn, clientHttpRequest *http, char *url, const char *req_hdr)
+prepareTransparentURL(ConnStateData::Pointer & conn, ClientHttpRequest *http, char *url, const char *req_hdr)
 {
     char *host;
 
@@ -1852,7 +1852,7 @@ parseHttpRequest(ConnStateData::Pointer & conn, method_t * method_p,
     size_t header_sz;          /* size of headers, not including first line */
     size_t prefix_sz;          /* size of whole request (req-line + headers) */
     size_t req_sz;
-    clientHttpRequest *http;
+    ClientHttpRequest *http;
     ClientSocketContext *result;
     StoreIOBuffer tempBuffer;
     char *http_version;
@@ -2169,7 +2169,7 @@ clientAfterReadingRequests(int fd, ConnStateData::Pointer &conn, int do_next_rea
 static void
 clientProcessRequest(ConnStateData::Pointer &conn, ClientSocketContext *context, method_t method, char *prefix, size_t req_line_sz)
 {
-    clientHttpRequest *http = context->http;
+    ClientHttpRequest *http = context->http;
     HttpRequest *request = NULL;
     /* We have an initial client stream in place should it be needed */
     /* setup our private context */
@@ -2695,9 +2695,9 @@ requestTimeout(int fd, void *data)
         /*
          * Generate an error
          */
-        clientHttpRequest **H;
+        ClientHttpRequest **H;
         clientStreamNode *node;
-        clientHttpRequest *http =
+        ClientHttpRequest *http =
             parseHttpRequestAbort(conn, "error:Connection%20lifetime%20expired");
         node = http->client_stream.tail->prev->data;
         clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
@@ -2747,7 +2747,7 @@ requestTimeout(int fd, void *data)
 static void
 clientLifetimeTimeout(int fd, void *data)
 {
-    clientHttpRequest *http = (clientHttpRequest *)data;
+    ClientHttpRequest *http = (ClientHttpRequest *)data;
     debug(33,
           1) ("WARNING: Closing client %s connection due to lifetime timeout\n",
               inet_ntoa(http->getConn()->peer.sin_addr));
@@ -3229,7 +3229,7 @@ varyEvaluateMatch(StoreEntry * entry, HttpRequest * request)
 }
 
 ACLChecklist *
-clientAclChecklistCreate(const acl_access * acl, clientHttpRequest * http)
+clientAclChecklistCreate(const acl_access * acl, ClientHttpRequest * http)
 {
     ACLChecklist *ch;
     ConnStateData::Pointer conn = http->getConn();

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 929a7eb4ffc7a7fc622002ec131469d501fd1088..84fcb1e6d54e361e5c4f43881254a7092975788e 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.cc,v 1.85 2005/08/14 20:34:54 serassio Exp $
+ * $Id: client_side_reply.cc,v 1.86 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -77,7 +77,7 @@ clientReplyContext::~clientReplyContext()
     cbdataReferenceDone(http);
 }
 
-clientReplyContext::clientReplyContext(clientHttpRequest *clientContext) : http (cbdataReference(clientContext)), old_entry (NULL), old_sc(NULL), deleting(false)
+clientReplyContext::clientReplyContext(ClientHttpRequest *clientContext) : http (cbdataReference(clientContext)), old_entry (NULL), old_sc(NULL), deleting(false)
 {}
 
 /* create an error in the store awaiting the client side to read it. */
@@ -1146,7 +1146,7 @@ clientReplyContext::storeNotOKTransferDone() const
  *
  */
 int
-clientHttpRequestStatus(int fd, clientHttpRequest const *http)
+clientHttpRequestStatus(int fd, ClientHttpRequest const *http)
 {
 #if SIZEOF_SIZE_T == 4
 
@@ -1187,7 +1187,7 @@ clientHttpRequestStatus(int fd, clientHttpRequest const *http)
  * of the object.
  */
 clientStream_status_t
-clientReplyStatus(clientStreamNode * aNode, clientHttpRequest * http)
+clientReplyStatus(clientStreamNode * aNode, ClientHttpRequest * http)
 {
     clientReplyContext *context = dynamic_cast<clientReplyContext *>(aNode->data.getRaw());
     assert (context);
@@ -1614,7 +1614,7 @@ clientReplyContext::identifyFoundObject(StoreEntry *newEntry)
  * data context is not null
  */
 void
-clientGetMoreData(clientStreamNode * aNode, clientHttpRequest * http)
+clientGetMoreData(clientStreamNode * aNode, ClientHttpRequest * http)
 {
     /* Test preconditions */
     assert(aNode != NULL);
@@ -1709,7 +1709,7 @@ clientReplyContext::doGetMoreData()
 
 /* the next node has removed itself from the stream. */
 void
-clientReplyDetach(clientStreamNode * node, clientHttpRequest * http)
+clientReplyDetach(clientStreamNode * node, ClientHttpRequest * http)
 {
     /* detach from the stream */
     clientStreamDetach(node, http);

diff --git a/src/client_side_reply.h b/src/client_side_reply.h
index 93aab8eb80c1fd0c8ed0b59728a3ab5e7d1a801f..b00ff91f5d4db421443a925e373790751191e881 100644 (file)
--- a/src/client_side_reply.h
+++ b/src/client_side_reply.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.h,v 1.7 2005/04/18 21:52:42 hno Exp $
+ * $Id: client_side_reply.h,v 1.8 2005/09/09 17:31:33 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -53,7 +53,7 @@ public:
     static STCB HandleIMSReply;
     static STCB SendMoreData;
 
-    clientReplyContext(clientHttpRequest *);
+    clientReplyContext(ClientHttpRequest *);
     ~clientReplyContext();
 
     void saveState();
@@ -90,7 +90,7 @@ public:
     int lookingforstore;
     virtual void created (StoreEntry *newEntry);
 
-    clientHttpRequest *http;
+    ClientHttpRequest *http;
     int headers_sz;
     store_client *sc;          /* The store_client we're using */
     StoreIOBuffer tempBuffer;  /* For use in validating requests via IMS */

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index e8583f0d9bb8d94af49c4342369fe15f38e890b6..0c1f13ac5f47e04982b2fdb19cb7d911642bbb5a 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.44 2005/03/06 21:08:13 serassio Exp $
+ * $Id: client_side_request.cc,v 1.45 2005/09/09 17:31:33 wessels Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -75,7 +75,7 @@ public:
 
     ACLChecklist *acl_checklist;       /* need ptr back so we can unreg if needed */
     int redirect_state;
-    clientHttpRequest *http;
+    ClientHttpRequest *http;
 
 private:
     CBDATA_CLASS(ClientRequestContext);
@@ -104,9 +104,9 @@ ClientRequestContext::operator delete (void *address)
 /* Local functions */
 /* other */
 static void clientAccessCheckDone(int, void *);
-static int clientCachable(clientHttpRequest * http);
-static int clientHierarchical(clientHttpRequest * http);
-static void clientInterpretRequestHeaders(clientHttpRequest * http);
+static int clientCachable(ClientHttpRequest * http);
+static int clientHierarchical(ClientHttpRequest * http);
+static void clientInterpretRequestHeaders(ClientHttpRequest * http);
 static void clientRedirectStart(ClientRequestContext *context);
 static RH clientRedirectDone;
 extern "C" CSR clientGetMoreData;
@@ -270,7 +270,7 @@ clientBeginRequest(method_t method, char const *url, CSCB * streamcallback,
 {
     size_t url_sz;
     HttpVersion http_ver (1, 0);
-    clientHttpRequest *http = new ClientHttpRequest;
+    ClientHttpRequest *http = new ClientHttpRequest;
     HttpRequest *request;
     StoreIOBuffer tempBuffer;
     http->http_ver = http_ver;
@@ -362,14 +362,14 @@ clientAccessCheckDone(int answer, void *data)
     ClientRequestContext *context = (ClientRequestContext *)data;
 
     context->acl_checklist = NULL;
-    clientHttpRequest *http_ = context->http;
+    ClientHttpRequest *http_ = context->http;
 
     if (!cbdataReferenceValid (http_)) {
         delete context;
         return;
     }
 
-    clientHttpRequest *http = context->http;
+    ClientHttpRequest *http = context->http;
     err_type page_id;
     http_status status;
     debug(85, 2) ("The request %s %s is %s, because it matched '%s'\n",
@@ -442,7 +442,7 @@ static void
 clientRedirectAccessCheckDone(int answer, void *data)
 {
     ClientRequestContext *context = (ClientRequestContext *)data;
-    clientHttpRequest *http = context->http;
+    ClientHttpRequest *http = context->http;
     context->acl_checklist = NULL;
 
     if (answer == ACCESS_ALLOWED)
@@ -454,7 +454,7 @@ clientRedirectAccessCheckDone(int answer, void *data)
 static void
 clientRedirectStart(ClientRequestContext *context)
 {
-    clientHttpRequest *http = context->http;
+    ClientHttpRequest *http = context->http;
     debug(33, 5) ("clientRedirectStart: '%s'\n", http->uri);
 
     if (Config.Program.redirect == NULL) {
@@ -470,7 +470,7 @@ clientRedirectStart(ClientRequestContext *context)
 }
 
 static int
-clientCachable(clientHttpRequest * http)
+clientCachable(ClientHttpRequest * http)
 {
     HttpRequest *req = http->request;
     method_t method = req->method;
@@ -511,7 +511,7 @@ clientCachable(clientHttpRequest * http)
 }
 
 static int
-clientHierarchical(clientHttpRequest * http)
+clientHierarchical(ClientHttpRequest * http)
 {
     const char *url = http->uri;
     HttpRequest *request = http->request;
@@ -564,7 +564,7 @@ clientHierarchical(clientHttpRequest * http)
 
 
 static void
-clientInterpretRequestHeaders(clientHttpRequest * http)
+clientInterpretRequestHeaders(ClientHttpRequest * http)
 {
     HttpRequest *request = http->request;
     const HttpHeader *req_hdr = &request->header;
@@ -730,14 +730,14 @@ void
 clientRedirectDone(void *data, char *result)
 {
     ClientRequestContext *context = (ClientRequestContext *)data;
-    clientHttpRequest *http_ = context->http;
+    ClientHttpRequest *http_ = context->http;
 
     if (!cbdataReferenceValid (http_)) {
         delete context;
         return;
     }
 
-    clientHttpRequest *http = context->http;
+    ClientHttpRequest *http = context->http;
     HttpRequest *new_request = NULL;
     HttpRequest *old_request = http->request;
     debug(85, 5) ("clientRedirectDone: '%s' result=%s\n", http->uri,
@@ -845,7 +845,7 @@ void
 ClientRequestContext::checkNoCacheDone(int answer)
 {
     acl_checklist = NULL;
-    clientHttpRequest *http_ = http;
+    ClientHttpRequest *http_ = http;
 
     if (!cbdataReferenceValid (http_)) {
         delete this;

diff --git a/src/client_side_request.h b/src/client_side_request.h
index d874fd3319cb39c8f9f2fed33804745385a08493..fd8e244e7d93029ef0a7fd76a494600dff485b6a 100644 (file)
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.h,v 1.19 2003/09/01 03:49:38 robertc Exp $
+ * $Id: client_side_request.h,v 1.20 2005/09/09 17:31:33 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -44,8 +44,6 @@ extern int clientBeginRequest(method_t, char const *, CSCB *, CSD *, ClientStrea
 
 class MemObject;
 
-typedef class ClientHttpRequest clientHttpRequest;
-
 class ConnStateData;
 
 class ClientHttpRequest
@@ -144,15 +142,15 @@ private:
 };
 
 /* client http based routines */
-SQUIDCEXTERN char *clientConstructTraceEcho(clientHttpRequest *);
+SQUIDCEXTERN char *clientConstructTraceEcho(ClientHttpRequest *);
 SQUIDCEXTERN ACLChecklist *clientAclChecklistCreate(const acl_access * acl,ClientHttpRequest * http);
-SQUIDCEXTERN int clientHttpRequestStatus(int fd, clientHttpRequest const *http);
+SQUIDCEXTERN int clientHttpRequestStatus(int fd, ClientHttpRequest const *http);
 SQUIDCEXTERN void clientAccessCheck(ClientHttpRequest *);
 
 /* ones that should be elsewhere */
-SQUIDCEXTERN void redirectStart(clientHttpRequest *, RH *, void *);
+SQUIDCEXTERN void redirectStart(ClientHttpRequest *, RH *, void *);
 
-SQUIDCEXTERN void sslStart(clientHttpRequest *, size_t *, int *);
+SQUIDCEXTERN void sslStart(ClientHttpRequest *, size_t *, int *);
 
 #ifdef _USE_INLINE_
 #include "Store.h"

diff --git a/src/redirect.cc b/src/redirect.cc
index e5c431ab96ff9eb7690153003e12de4eac83d84a..56445ef0fe48e4a2fe6d68e18e53f5b4a9d675ad 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: redirect.cc,v 1.110 2005/04/18 21:52:43 hno Exp $
+ * $Id: redirect.cc,v 1.111 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 61    Redirector
  * AUTHOR: Duane Wessels
@@ -104,7 +104,7 @@ redirectStats(StoreEntry * sentry)
 /**** PUBLIC FUNCTIONS ****/
 
 void
-redirectStart(clientHttpRequest * http, RH * handler, void *data)
+redirectStart(ClientHttpRequest * http, RH * handler, void *data)
 {
     ConnStateData::Pointer conn = http->getConn();
     redirectStateData *r = NULL;

diff --git a/src/stat.cc b/src/stat.cc
index 73eb0145cb7775d5e067851468ac053499565ee1..be158cacf8739a59b2e2cfd6c04da8f68a0545a6 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: stat.cc,v 1.389 2005/05/15 10:33:49 serassio Exp $
+ * $Id: stat.cc,v 1.390 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -1595,12 +1595,12 @@ static void
 statClientRequests(StoreEntry * s)
 {
     dlink_node *i;
-    clientHttpRequest *http;
+    ClientHttpRequest *http;
     StoreEntry *e;
     int fd;
 
     for (i = ClientActiveRequests.head; i; i = i->next) {
-        http = static_cast<clientHttpRequest *>(i->data);
+        http = static_cast<ClientHttpRequest *>(i->data);
         assert(http);
         ConnStateData::Pointer conn = http->getConn();
         storeAppendPrintf(s, "Connection: %p\n", conn.getRaw());

diff --git a/src/tunnel.cc b/src/tunnel.cc
index b083e50cb8219393c24201c889b136bb12cda065..346cc1e56567c4f608815c45edc16e53bf7b96ce 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.151 2005/08/31 19:15:36 wessels Exp $
+ * $Id: tunnel.cc,v 1.152 2005/09/09 17:31:33 wessels Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -577,7 +577,7 @@ sslConnectDone(int fdnotused, comm_err_t status, int xerrno, void *data)
 }
 
 void
-sslStart(clientHttpRequest * http, size_t * size_ptr, int *status_ptr)
+sslStart(ClientHttpRequest * http, size_t * size_ptr, int *status_ptr)
 {
     /* Create state structure. */
     SslStateData *sslState = NULL;