util/{Const,Writable}Buffer, ...: rename IsEmpty() to empty(), imitating STL
This commit is contained in:
@@ -88,7 +88,7 @@ bool
|
||||
AsyncInputStream::IsEOF() noexcept
|
||||
{
|
||||
return (KnownSize() && offset >= size) ||
|
||||
(!open && buffer.IsEmpty());
|
||||
(!open && buffer.empty());
|
||||
}
|
||||
|
||||
void
|
||||
@@ -108,7 +108,7 @@ AsyncInputStream::Seek(offset_type new_offset)
|
||||
|
||||
while (new_offset > offset) {
|
||||
auto r = buffer.Read();
|
||||
if (r.IsEmpty())
|
||||
if (r.empty())
|
||||
break;
|
||||
|
||||
const size_t nbytes =
|
||||
@@ -162,7 +162,7 @@ AsyncInputStream::IsAvailable() noexcept
|
||||
{
|
||||
return postponed_exception ||
|
||||
IsEOF() ||
|
||||
!buffer.IsEmpty();
|
||||
!buffer.empty();
|
||||
}
|
||||
|
||||
size_t
|
||||
@@ -176,7 +176,7 @@ AsyncInputStream::Read(void *ptr, size_t read_size)
|
||||
Check();
|
||||
|
||||
r = buffer.Read();
|
||||
if (!r.IsEmpty() || IsEOF())
|
||||
if (!r.empty() || IsEOF())
|
||||
break;
|
||||
|
||||
cond.wait(mutex);
|
||||
@@ -209,7 +209,7 @@ void
|
||||
AsyncInputStream::AppendToBuffer(const void *data, size_t append_size) noexcept
|
||||
{
|
||||
auto w = buffer.Write();
|
||||
assert(!w.IsEmpty());
|
||||
assert(!w.empty());
|
||||
|
||||
size_t nbytes = std::min(w.size, append_size);
|
||||
memcpy(w.data, data, nbytes);
|
||||
@@ -218,7 +218,7 @@ AsyncInputStream::AppendToBuffer(const void *data, size_t append_size) noexcept
|
||||
const size_t remaining = append_size - nbytes;
|
||||
if (remaining > 0) {
|
||||
w = buffer.Write();
|
||||
assert(!w.IsEmpty());
|
||||
assert(!w.empty());
|
||||
assert(w.size >= remaining);
|
||||
|
||||
memcpy(w.data, (const uint8_t *)data + nbytes, remaining);
|
||||
|
@@ -114,7 +114,7 @@ protected:
|
||||
}
|
||||
|
||||
bool IsBufferEmpty() const noexcept {
|
||||
return buffer.IsEmpty();
|
||||
return buffer.empty();
|
||||
}
|
||||
|
||||
bool IsBufferFull() const noexcept {
|
||||
|
@@ -47,7 +47,7 @@ TextInputStream::ReadLine()
|
||||
/* line too long: terminate the current
|
||||
line */
|
||||
|
||||
assert(!dest.IsEmpty());
|
||||
assert(!dest.empty());
|
||||
dest[0] = 0;
|
||||
line = buffer.Read().data;
|
||||
buffer.Clear();
|
||||
@@ -79,12 +79,12 @@ TextInputStream::ReadLine()
|
||||
line */
|
||||
|
||||
dest = buffer.Write();
|
||||
assert(!dest.IsEmpty());
|
||||
assert(!dest.empty());
|
||||
dest[0] = 0;
|
||||
|
||||
auto r = buffer.Read();
|
||||
buffer.Clear();
|
||||
return r.IsEmpty()
|
||||
return r.empty()
|
||||
? nullptr
|
||||
: r.data;
|
||||
}
|
||||
|
@@ -80,7 +80,7 @@ ThreadInputStream::ThreadFunc()
|
||||
assert(!postponed_exception);
|
||||
|
||||
auto w = buffer.Write();
|
||||
if (w.IsEmpty()) {
|
||||
if (w.empty()) {
|
||||
wake_cond.wait(mutex);
|
||||
} else {
|
||||
size_t nbytes;
|
||||
@@ -122,7 +122,7 @@ ThreadInputStream::IsAvailable() noexcept
|
||||
{
|
||||
assert(!thread.IsInside());
|
||||
|
||||
return !buffer.IsEmpty() || eof || postponed_exception;
|
||||
return !buffer.empty() || eof || postponed_exception;
|
||||
}
|
||||
|
||||
inline size_t
|
||||
@@ -135,7 +135,7 @@ ThreadInputStream::Read(void *ptr, size_t read_size)
|
||||
std::rethrow_exception(postponed_exception);
|
||||
|
||||
auto r = buffer.Read();
|
||||
if (!r.IsEmpty()) {
|
||||
if (!r.empty()) {
|
||||
size_t nbytes = std::min(read_size, r.size);
|
||||
memcpy(ptr, r.data, nbytes);
|
||||
buffer.Consume(nbytes);
|
||||
|
Reference in New Issue
Block a user