From 398281cd76f398b6db1a5f7bc8bed9d11374a465 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 18 Nov 2019 21:25:04 +0100 Subject: io/FileDescriptor: add method FullRead() --- test/run_filter.cxx | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'test') diff --git a/test/run_filter.cxx b/test/run_filter.cxx index c6b6f9bff..40dce22c2 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -80,21 +80,6 @@ WriteOrThrow(FileDescriptor fd, const void *buffer, size_t size) return nbytes; } -static void -FullRead(FileDescriptor fd, void *_buffer, size_t size) -{ - auto buffer = (uint8_t *)_buffer; - - while (size > 0) { - size_t nbytes = ReadOrThrow(fd, buffer, size); - if (nbytes == 0) - throw std::runtime_error("Premature end of input"); - - buffer += nbytes; - size -= nbytes; - } -} - static void FullWrite(FileDescriptor fd, ConstBuffer src) { @@ -125,7 +110,7 @@ ReadFrames(FileDescriptor fd, void *_buffer, size_t size, size_t frame_size) const size_t modulo = nbytes % frame_size; if (modulo > 0) { size_t rest = frame_size - modulo; - FullRead(fd, buffer + nbytes, rest); + fd.FullRead(buffer + nbytes, rest); nbytes += rest; } -- cgit v1.2.3