util/*FifoBuffer: migrate from WritableBuffer to std::span

This commit is contained in:
Max Kellermann
2022-05-10 17:26:41 +02:00
committed by Max Kellermann
parent 570755f05a
commit bb7be9a4cd
23 changed files with 114 additions and 129 deletions

View File

@@ -29,7 +29,7 @@ DecoderBuffer::Fill()
return false;
size_t nbytes = decoder_read(client, is,
w.data, w.size);
w.data(), w.size());
if (nbytes == 0)
/* end of file, I/O error or decoder command
received */
@@ -39,16 +39,16 @@ DecoderBuffer::Fill()
return true;
}
ConstBuffer<void>
std::span<const std::byte>
DecoderBuffer::Need(size_t min_size)
{
while (true) {
const auto r = Read();
if (r.size >= min_size)
if (r.size() >= min_size)
return r;
if (!Fill())
return nullptr;
return {};
}
}
@@ -56,13 +56,13 @@ bool
DecoderBuffer::Skip(size_t nbytes)
{
const auto r = buffer.Read();
if (r.size >= nbytes) {
if (r.size() >= nbytes) {
buffer.Consume(nbytes);
return true;
}
buffer.Clear();
nbytes -= r.size;
nbytes -= r.size();
return decoder_skip(client, is, nbytes);
}