Remove call to FlushWriteBuffer from BufferedSocket::Write(), this means we don't try write() pointlessly when we may very well not (chewing CPU), and instead waits for the socketengine to tell us we can write. Tested, works fine. (nothing used this return value anyway)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9247 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 6 insertions, 4 deletions

diff --git a/src/modules/m_http_client.cpp b/src/modules/m_http_client.cpp
index ef3cf5c33..ef036f3f2 100644
--- a/src/modules/m_http_client.cpp
+++ b/src/modules/m_http_client.cpp
@@ -292,7 +292,9 @@ bool HTTPSocket::OnConnected()
 	
 	this->status = HTTP_REQSENT;
 	
-	return this->Write(request);
+	this->Write(request);
+
+	return true;
 }
 
 bool HTTPSocket::OnDataReady()
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index e3c59e4b6..bc5bdc869 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -266,7 +266,7 @@ class TreeSocket : public BufferedSocket
 
 	/** Send one or more complete lines down the socket
 	 */
-	int WriteLine(std::string line);
+	void WriteLine(std::string line);
 
 	/** Handle ERROR command */
 	bool Error(std::deque<std::string> &params);
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 793982ec7..152f9dec3 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -32,11 +32,11 @@
 
 static std::map<std::string, std::string> warned;       /* Server names that have had protocol violation warnings displayed for them */
 
-int TreeSocket::WriteLine(std::string line)
+void TreeSocket::WriteLine(std::string line)
 {
 	Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
 	line.append("\r\n");
-	return this->Write(line);
+	this->Write(line);
 }