]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Rename ClientSocketContext::connIsFinished() to finished()
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 17 Nov 2015 03:50:31 +0000 (19:50 -0800)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 17 Nov 2015 03:50:31 +0000 (19:50 -0800)
Removes some needless mentions of "conn" and clarifies that the method
handles the context object and transaction finishing, not the connection
it belongs to.

src/Pipeline.cc
src/client_side.cc
src/client_side.h
src/servers/FtpServer.cc
src/tests/stub_client_side.cc

index 1ee7bda7a220114cf93ae41f19540d07af827d21..15190d618c835c4753978ae766764093900cdc43 100644 (file)
@@ -41,7 +41,7 @@ Pipeline::terminateAll(int xerrno)
         ClientSocketContextPointer context = requests.front();
         debugs(33, 3, "Pipeline " << (void*)this << " notify(" << xerrno << ") " << context);
         context->noteIoError(xerrno);
-        context->connIsFinished();  // cleanup and self-deregister
+        context->finished();  // cleanup and self-deregister
         assert(context != requests.front());
     }
 }
index 14087421daab7473df107b6df705eb87c00340d4..904d2f0714f23c62f4a92560679a79ba6a398b0b 100644 (file)
@@ -248,7 +248,7 @@ ClientSocketContext::registerWithConn()
 }
 
 void
-ClientSocketContext::connIsFinished()
+ClientSocketContext::finished()
 {
     assert (http);
     assert (http->getConn() != NULL);
@@ -1758,7 +1758,7 @@ ClientSocketContext::writeComplete(const Comm::ConnectionPointer &conn, char *,
         debugs(33, 5, conn << " Stream complete, keepalive is " << http->request->flags.proxyKeepalive);
         if (!http->request->flags.proxyKeepalive)
             clientConnection->close();
-        connIsFinished();
+        finished();
         return;
 
     case STREAM_UNPLANNED_COMPLETE:
index 2e9c047d467f3f576f2b86d25b6fc37b6186aee0..dbc082c5bd2c8efcc0f1df59983f23ade93b367a 100644 (file)
@@ -118,7 +118,7 @@ public:
     clientStreamNode * getTail() const;
     clientStreamNode * getClientReplyContext() const;
     ConnStateData *getConn() const;
-    void connIsFinished();
+    void finished(); ///< cleanup when the transaction has finished
     void deferRecipientForLater(clientStreamNode * node, HttpReply * rep, StoreIOBuffer receivedData);
     bool multipartRangeRequest() const;
     void registerWithConn();
index bd1be2db2c3a2f46d045ae4033fe4671a191dfc0..35e27bb16bd25a9314cad5180d8982e5d201a2ea 100644 (file)
@@ -1274,7 +1274,7 @@ Ftp::Server::wroteReply(const CommIoCbParams &io)
         changeState(fssConnected, "Ftp::Server::wroteReply");
         if (bodyParser)
             finishDechunkingRequest(false);
-        context->connIsFinished();
+        context->finished();
         return;
     }
 }
index bf3a393694c111901cecdda673ae2668d09cc10e..df99ec0c0f65c6fdb25761655041ee2e4436ed4d 100644 (file)
@@ -27,7 +27,7 @@ void ClientSocketContext::noteSentBodyBytes(size_t) STUB
 void ClientSocketContext::buildRangeHeader(HttpReply * rep) STUB
 clientStreamNode * ClientSocketContext::getTail() const STUB_RETVAL(NULL)
 clientStreamNode * ClientSocketContext::getClientReplyContext() const STUB_RETVAL(NULL)
-void ClientSocketContext::connIsFinished() STUB
+void ClientSocketContext::finished() STUB
 void ClientSocketContext::deferRecipientForLater(clientStreamNode * node, HttpReply * rep, StoreIOBuffer receivedData) STUB
 bool ClientSocketContext::multipartRangeRequest() const STUB_RETVAL(false)
 void ClientSocketContext::registerWithConn() STUB