diff options
author | Max Kellermann <mk@cm4all.com> | 2019-11-18 21:25:04 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2020-09-07 20:07:47 +0200 |
commit | 398281cd76f398b6db1a5f7bc8bed9d11374a465 (patch) | |
tree | 7c0bd460a4fe63648dbcecb1044776b4d06d43e6 /test | |
parent | 88446ccde961cde1ec21ec6036fef2f2b81af3b4 (diff) |
io/FileDescriptor: add method FullRead()
Diffstat (limited to 'test')
-rw-r--r-- | test/run_filter.cxx | 17 |
1 files changed, 1 insertions, 16 deletions
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 @@ -81,21 +81,6 @@ WriteOrThrow(FileDescriptor fd, const void *buffer, size_t size) } 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<uint8_t> src) { while (!src.empty()) { @@ -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; } |