Rename previsouly private HttpRequest:initXX() to initHTTP() and use

it in urlParse().

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 79f0e773a281633cd0c4b5561b4b28e1107a2a6b..89f48205118a92ab53078d0010b9ae873de961aa 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpRequest.cc,v 1.57 2006/01/19 18:40:28 wessels Exp $
+ * $Id: HttpRequest.cc,v 1.58 2006/01/19 18:50:36 wessels Exp $
  *
  * DEBUG: section 73    HTTP Request
  * AUTHOR: Duane Wessels
@@ -48,7 +48,7 @@ HttpRequest::HttpRequest() : HttpMsg(hoRequest), link_count(0)
 HttpRequest::HttpRequest(method_t aMethod, protocol_t aProtocol, const char *aUrlpath) : HttpMsg(hoRequest),link_count(0)
 {
     init();
-    initXX(aMethod, aProtocol, aUrlpath);
+    initHTTP(aMethod, aProtocol, aUrlpath);
 }
 
 HttpRequest::~HttpRequest()
@@ -58,7 +58,7 @@ HttpRequest::~HttpRequest()
 }
 
 void
-HttpRequest::initXX(method_t aMethod, protocol_t aProtocol, const char *aUrlpath)
+HttpRequest::initHTTP(method_t aMethod, protocol_t aProtocol, const char *aUrlpath)
 {
     method = aMethod;
     protocol = aProtocol;

diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 00781e267de1e1454f4c6995001e50d36104fc18..1423cda187c8a1038086dffba25d4fddbfc5491f 100644 (file)
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpRequest.h,v 1.16 2006/01/19 18:40:28 wessels Exp $
+ * $Id: HttpRequest.h,v 1.17 2006/01/19 18:50:36 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -57,9 +57,9 @@ public:
     HttpRequest(method_t aMethod, protocol_t aProtocol, const char *aUrlpath);
     ~HttpRequest();
     virtual void reset();
+    void initHTTP(method_t aMethod, protocol_t aProtocol, const char *aUrlpath);
 
 protected:
-    void initXX(method_t aMethod, protocol_t aProtocol, const char *aUrlpath);
     void clean();
     void init();
 

diff --git a/src/url.cc b/src/url.cc
index d5d5c73108f97fe36b283c1320f579076f11acd2..77370fdeca2a0fbced01d660d7b7e4f2d288ea9f 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.149 2006/01/19 18:40:28 wessels Exp $
+ * $Id: url.cc,v 1.150 2006/01/19 18:50:36 wessels Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -461,9 +461,7 @@ urlParse(method_t method, char *url, HttpRequest *request)
     if (NULL == request)
         request = new HttpRequest(method, protocol, urlpath);
     else {
-        request->method = method;
-        request->protocol = protocol;
-        request->urlpath = urlpath;
+        request->initHTTP(method, protocol, urlpath);
     }
 
     xstrncpy(request->host, host, SQUIDHOSTNAMELEN);