From 5b213b0504849b894cf930474fb1bff7cb34cd70 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 6 Nov 2013 21:52:09 +0100
Subject: [PATCH] event/FullyBufferedSocket: make WriteFromBuffer() protected
.. and rename it to Flush().
---
src/event/FullyBufferedSocket.cxx | 4 ++--
src/event/FullyBufferedSocket.hxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/event/FullyBufferedSocket.cxx b/src/event/FullyBufferedSocket.cxx
index 3ffd9f416..6a0df183d 100644
--- a/src/event/FullyBufferedSocket.cxx
+++ b/src/event/FullyBufferedSocket.cxx
@@ -54,7 +54,7 @@ FullyBufferedSocket::DirectWrite(const void *data, size_t length)
}
bool
-FullyBufferedSocket::WriteFromBuffer()
+FullyBufferedSocket::Flush()
{
assert(IsDefined());
@@ -128,7 +128,7 @@ FullyBufferedSocket::OnSocketReady(unsigned flags)
if (flags & WRITE) {
assert(!output.IsEmpty());
- if (!WriteFromBuffer())
+ if (!Flush())
return false;
}
diff --git a/src/event/FullyBufferedSocket.hxx b/src/event/FullyBufferedSocket.hxx
index 29a6ae64b..90638e60b 100644
--- a/src/event/FullyBufferedSocket.hxx
+++ b/src/event/FullyBufferedSocket.hxx
@@ -44,14 +44,14 @@ public:
private:
ssize_t DirectWrite(const void *data, size_t length);
+protected:
/**
* Send data from the output buffer to the socket.
*
* @return false if the socket has been closed
*/
- bool WriteFromBuffer();
+ bool Flush();
-protected:
/**
* @return false if the socket has been closed
*/