Removed SocketBuffer::pushStrSwap.

5 files changed, 17 insertions, 31 deletions

diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc
index de11fb51..f98dd731 100644
--- a/src/FtpConnection.cc
+++ b/src/FtpConnection.cc
@@ -85,7 +85,7 @@ bool FtpConnection::sendUser()
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, "USER ********"));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -99,7 +99,7 @@ bool FtpConnection::sendPass()
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, "PASS ********"));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -113,7 +113,7 @@ bool FtpConnection::sendType()
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_,request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -125,7 +125,7 @@ bool FtpConnection::sendPwd()
     std::string request = "PWD\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_,request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -139,7 +139,7 @@ bool FtpConnection::sendCwd(const std::string& dir)
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_,request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -154,7 +154,7 @@ bool FtpConnection::sendMdtm()
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -169,7 +169,7 @@ bool FtpConnection::sendSize()
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -181,7 +181,7 @@ bool FtpConnection::sendEpsv()
     std::string request("EPSV\r\n");
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -193,7 +193,7 @@ bool FtpConnection::sendPasv()
     std::string request("PASV\r\n");
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -227,7 +227,7 @@ bool FtpConnection::sendEprt(const SharedHandle<SocketCore>& serverSocket)
     request += util::uitos(addrinfo.second);
     request += "|\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -257,7 +257,7 @@ bool FtpConnection::sendPort(const SharedHandle<SocketCore>& serverSocket)
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -275,7 +275,7 @@ bool FtpConnection::sendRest(const SharedHandle<Segment>& segment)
     request += "\r\n";    
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
@@ -290,7 +290,7 @@ bool FtpConnection::sendRetr()
     request += "\r\n";
     A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                     cuid_, request.c_str()));
-    socketBuffer_.pushStrSwap(request);
+    socketBuffer_.pushStr(request);
   }
   socketBuffer_.send();
   return socketBuffer_.sendBufferIsEmpty();
diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
index eacdabd0..8b511445 100644
--- a/src/HttpConnection.cc
+++ b/src/HttpConnection.cc
@@ -109,7 +109,7 @@ void HttpConnection::sendRequest(const SharedHandle<HttpRequest>& httpRequest)
   A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                   cuid_,
                   eraseConfidentialInfo(request).c_str()));
-  socketBuffer_.pushStrSwap(request);
+  socketBuffer_.pushStr(request);
   socketBuffer_.send();
   SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest));
   outstandingHttpRequests_.push_back(entry);
@@ -122,7 +122,7 @@ void HttpConnection::sendProxyRequest
   A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
                   cuid_,
                   eraseConfidentialInfo(request).c_str()));
-  socketBuffer_.pushStrSwap(request);
+  socketBuffer_.pushStr(request);
   socketBuffer_.send();
   SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest));
   outstandingHttpRequests_.push_back(entry);
diff --git a/src/HttpServer.cc b/src/HttpServer.cc
index f653620d..3247457c 100644
--- a/src/HttpServer.cc
+++ b/src/HttpServer.cc
@@ -200,8 +200,8 @@ void HttpServer::feedResponse(const std::string& status,
 
   header += "\r\n";
   A2_LOG_DEBUG(fmt("HTTP Server sends response:\n%s", header.c_str()));
-  socketBuffer_.pushStrSwap(header);
-  socketBuffer_.pushStrSwap(text);
+  socketBuffer_.pushStr(header);
+  socketBuffer_.pushStr(text);
 }
 
 ssize_t HttpServer::sendResponse()
diff --git a/src/SocketBuffer.cc b/src/SocketBuffer.cc
index a7933fd8..35cd2419 100644
--- a/src/SocketBuffer.cc
+++ b/src/SocketBuffer.cc
@@ -106,15 +106,6 @@ void SocketBuffer::pushStr(const std::string& data)
   }
 }
 
-void SocketBuffer::pushStrSwap(std::string& data)
-{
-  if(data.size() > 0) {
-    SharedHandle<StringBufEntry> e(new StringBufEntry());
-    e->swap(data);
-    bufq_.push_back(e);
-  }
-}
-
 ssize_t SocketBuffer::send()
 {
   size_t totalslen = 0;
diff --git a/src/SocketBuffer.h b/src/SocketBuffer.h
index 8cdcf3a1..687cd703 100644
--- a/src/SocketBuffer.h
+++ b/src/SocketBuffer.h
@@ -105,11 +105,6 @@ public:
   // Feeds data into queue. This function doesn't send data.
   void pushStr(const std::string& data);
 
-  // Feeds data into queue. This function doesn't send data.  data is
-  // swapped with internal buffer, so after this call, data will be
-  // empty.
-  void pushStrSwap(std::string& data);
-
   // Sends data in queue.  Returns the number of bytes sent.
   ssize_t send();