From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 15 Nov 2015 10:16:35 +0000 (-0800)
Subject: Replace ConnStateData::addContextToQueue() with Pipeline::add()
X-Git-Tag: SQUID_4_0_3~5^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43b3db9c151d896d0fa1fc0ba6e33968a76b792a;p=thirdparty%2Fsquid.git

Replace ConnStateData::addContextToQueue() with Pipeline::add()
---

diff --git a/src/client_side.cc b/src/client_side.cc
index d3ef7e95a8..06f63d195a 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -271,7 +271,7 @@ ClientSocketContext::registerWithConn()
     assert (http);
     assert (http->getConn() != NULL);
     connRegistered_ = true;
-    http->getConn()->addContextToQueue(this);
+    http->getConn()->pipeline.add(ClientSocketContext::Pointer(this));
 }
 
 void
@@ -2260,18 +2260,6 @@ parseHttpRequest(ConnStateData *csd, const Http1::RequestParserPointer &hp)
     return result;
 }
 
-void
-ConnStateData::addContextToQueue(ClientSocketContext * context)
-{
-    ClientSocketContext::Pointer *S;
-
-    for (S = (ClientSocketContext::Pointer *) & currentobject; S->getRaw();
-            S = &(*S)->next);
-    *S = context;
-
-    ++pipeline.nrequests;
-}
-
 int
 ConnStateData::getConcurrentRequestCount() const
 {
diff --git a/src/client_side.h b/src/client_side.h
index 953cd30633..ba6babf783 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -188,7 +188,6 @@ public:
     bool clientParseRequests();
     void readNextRequest();
     ClientSocketContext::Pointer getCurrentContext() const;
-    void addContextToQueue(ClientSocketContext * context);
     int getConcurrentRequestCount() const;
     bool isOpen() const;
 
diff --git a/src/tests/stub_client_side.cc b/src/tests/stub_client_side.cc
index 513141b0b4..238455410f 100644
--- a/src/tests/stub_client_side.cc
+++ b/src/tests/stub_client_side.cc
@@ -41,7 +41,6 @@ void ConnStateData::freeAllContexts() STUB
 void ConnStateData::notifyAllContexts(const int xerrno) STUB
 bool ConnStateData::clientParseRequests() STUB_RETVAL(false)
 void ConnStateData::readNextRequest() STUB
-void ConnStateData::addContextToQueue(ClientSocketContext * context) STUB
 int ConnStateData::getConcurrentRequestCount() const STUB_RETVAL(0)
 bool ConnStateData::isOpen() const STUB_RETVAL(false)
 void ConnStateData::sendControlMsg(HttpControlMsg msg) STUB