diff --git a/lib/base/fifo.cpp b/lib/base/fifo.cpp index df5fce509..89e0b3dc4 100644 --- a/lib/base/fifo.cpp +++ b/lib/base/fifo.cpp @@ -57,10 +57,8 @@ void FIFO::Optimize() /** * Implements IOQueue::Read. */ -size_t FIFO::Read(void *buffer, size_t count, bool allow_partial) +size_t FIFO::Read(void *buffer, size_t count) { - ASSERT(allow_partial); - if (count > m_DataSize) count = m_DataSize; diff --git a/lib/base/fifo.hpp b/lib/base/fifo.hpp index dbb37b570..a94666166 100644 --- a/lib/base/fifo.hpp +++ b/lib/base/fifo.hpp @@ -23,7 +23,7 @@ public: ~FIFO() override; - size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + size_t Read(void *buffer, size_t count) override; void Write(const void *buffer, size_t count) override; void Close() override; bool IsEof() const override; diff --git a/lib/base/networkstream.cpp b/lib/base/networkstream.cpp index 57da507d8..9d5f24441 100644 --- a/lib/base/networkstream.cpp +++ b/lib/base/networkstream.cpp @@ -23,12 +23,10 @@ void NetworkStream::Close() * @param count The number of bytes to read from the queue. * @returns The number of bytes actually read. */ -size_t NetworkStream::Read(void *buffer, size_t count, bool allow_partial) +size_t NetworkStream::Read(void *buffer, size_t count) { size_t rc; - ASSERT(allow_partial); - if (m_Eof) BOOST_THROW_EXCEPTION(std::invalid_argument("Tried to read from closed socket.")); diff --git a/lib/base/networkstream.hpp b/lib/base/networkstream.hpp index 453d7ad0b..0663962d6 100644 --- a/lib/base/networkstream.hpp +++ b/lib/base/networkstream.hpp @@ -22,7 +22,7 @@ public: NetworkStream(Socket::Ptr socket); - size_t Read(void *buffer, size_t count, bool allow_partial = false) override; + size_t Read(void *buffer, size_t count) override; void Write(const void *buffer, size_t count) override; void Close() override; diff --git a/lib/base/stdiostream.cpp b/lib/base/stdiostream.cpp index 449036f03..107db287d 100644 --- a/lib/base/stdiostream.cpp +++ b/lib/base/stdiostream.cpp @@ -21,7 +21,7 @@ StdioStream::~StdioStream() Close(); } -size_t StdioStream::Read(void *buffer, size_t size, bool allow_partial) +size_t StdioStream::Read(void *buffer, size_t size) { ObjectLock olock(this); diff --git a/lib/base/stdiostream.hpp b/lib/base/stdiostream.hpp index b305c7f97..8f65be4aa 100644 --- a/lib/base/stdiostream.hpp +++ b/lib/base/stdiostream.hpp @@ -18,7 +18,7 @@ public: StdioStream(std::iostream *innerStream, bool ownsStream); ~StdioStream() override; - size_t Read(void *buffer, size_t size, bool allow_partial = false) override; + size_t Read(void *buffer, size_t size) override; void Write(const void *buffer, size_t size) override; void Close() override; diff --git a/lib/base/stream.cpp b/lib/base/stream.cpp index e4a66586e..5a1c6d250 100644 --- a/lib/base/stream.cpp +++ b/lib/base/stream.cpp @@ -124,7 +124,7 @@ bool StreamReadContext::FillFromStream(const Stream::Ptr& stream, bool may_wait) if (stream->IsEof()) break; - size_t rc = stream->Read(Buffer + Size, 4096, true); + size_t rc = stream->Read(Buffer + Size, 4096); Size += rc; count += rc; diff --git a/lib/base/stream.hpp b/lib/base/stream.hpp index 69bdff872..63149310e 100644 --- a/lib/base/stream.hpp +++ b/lib/base/stream.hpp @@ -60,10 +60,9 @@ public: * @param buffer The buffer where data should be stored. May be nullptr if you're * not actually interested in the data. * @param count The number of bytes to read from the queue. - * @param allow_partial Whether to allow partial reads. * @returns The number of bytes actually read. */ - virtual size_t Read(void *buffer, size_t count, bool allow_partial = false) = 0; + virtual size_t Read(void *buffer, size_t count) = 0; /** * Writes data to the stream. diff --git a/test/base-fifo.cpp b/test/base-fifo.cpp index 5ecf1ac7d..4838adb71 100644 --- a/test/base-fifo.cpp +++ b/test/base-fifo.cpp @@ -25,12 +25,12 @@ BOOST_AUTO_TEST_CASE(io) BOOST_CHECK(fifo->GetAvailableBytes() == 5); char buffer1[2]; - fifo->Read(buffer1, 2, true); + fifo->Read(buffer1, 2); BOOST_CHECK(memcmp(buffer1, "he", 2) == 0); BOOST_CHECK(fifo->GetAvailableBytes() == 3); char buffer2[5]; - size_t rc = fifo->Read(buffer2, 5, true); + size_t rc = fifo->Read(buffer2, 5); BOOST_CHECK(rc == 3); BOOST_CHECK(memcmp(buffer2, "llo", 3) == 0); BOOST_CHECK(fifo->GetAvailableBytes() == 0);