From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 17 Nov 2015 03:50:31 +0000 (-0800)
Subject: Rename ClientSocketContext::connIsFinished() to finished()
X-Git-Tag: SQUID_4_0_3~5^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d20f59e2b5dbaaf7154a54cf50c9301c8a22db2d;p=thirdparty%2Fsquid.git

Rename ClientSocketContext::connIsFinished() to finished()

Removes some needless mentions of "conn" and clarifies that the method
handles the context object and transaction finishing, not the connection
it belongs to.
---

diff --git a/src/Pipeline.cc b/src/Pipeline.cc
index 1ee7bda7a2..15190d618c 100644
--- a/src/Pipeline.cc
+++ b/src/Pipeline.cc
@@ -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());
     }
 }
diff --git a/src/client_side.cc b/src/client_side.cc
index 14087421da..904d2f0714 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -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:
diff --git a/src/client_side.h b/src/client_side.h
index 2e9c047d46..dbc082c5bd 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -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();
diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc
index bd1be2db2c..35e27bb16b 100644
--- a/src/servers/FtpServer.cc
+++ b/src/servers/FtpServer.cc
@@ -1274,7 +1274,7 @@ Ftp::Server::wroteReply(const CommIoCbParams &io)
         changeState(fssConnected, "Ftp::Server::wroteReply");
         if (bodyParser)
             finishDechunkingRequest(false);
-        context->connIsFinished();
+        context->finished();
         return;
     }
 }
diff --git a/src/tests/stub_client_side.cc b/src/tests/stub_client_side.cc
index bf3a393694..df99ec0c0f 100644
--- a/src/tests/stub_client_side.cc
+++ b/src/tests/stub_client_side.cc
@@ -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