mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:17:36 +00:00
LibCore+Everywhere: Make Core::Stream read_line() return StringView
Similar reasoning to making Core::Stream::read() return Bytes, except that every user of read_line() creates a StringView from the result, so let's just return one right away.
This commit is contained in:
parent
c4134e9794
commit
d564cf1e89
9 changed files with 40 additions and 54 deletions
|
@ -88,9 +88,7 @@ ErrorOr<void> ConfigFile::reparse()
|
|||
|
||||
auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
|
||||
while (TRY(m_file->can_read_line())) {
|
||||
auto length = TRY(m_file->read_line(buffer));
|
||||
|
||||
StringView line { buffer.data(), length };
|
||||
auto line = TRY(m_file->read_line(buffer));
|
||||
size_t i = 0;
|
||||
|
||||
while (i < line.length() && (line[i] == ' ' || line[i] == '\t' || line[i] == '\n'))
|
||||
|
|
|
@ -557,10 +557,10 @@ public:
|
|||
|
||||
// Reads into the buffer until \n is encountered.
|
||||
// The size of the Bytes object is the maximum amount of bytes that will be
|
||||
// read. Returns the amount of bytes read.
|
||||
ErrorOr<size_t> read_line(Bytes buffer)
|
||||
// read. Returns the bytes read as a StringView.
|
||||
ErrorOr<StringView> read_line(Bytes buffer)
|
||||
{
|
||||
return TRY(read_until(buffer, "\n"sv)).size();
|
||||
return StringView { TRY(read_until(buffer, "\n"sv)) };
|
||||
}
|
||||
|
||||
ErrorOr<Bytes> read_until(Bytes buffer, StringView candidate)
|
||||
|
@ -769,7 +769,7 @@ public:
|
|||
return m_helper.stream().truncate(length);
|
||||
}
|
||||
|
||||
ErrorOr<size_t> read_line(Bytes buffer) { return m_helper.read_line(move(buffer)); }
|
||||
ErrorOr<StringView> read_line(Bytes buffer) { return m_helper.read_line(move(buffer)); }
|
||||
ErrorOr<Bytes> read_until(Bytes buffer, StringView candidate) { return m_helper.read_until(move(buffer), move(candidate)); }
|
||||
template<size_t N>
|
||||
ErrorOr<Bytes> read_until_any_of(Bytes buffer, Array<StringView, N> candidates) { return m_helper.read_until_any_of(move(buffer), move(candidates)); }
|
||||
|
@ -790,7 +790,7 @@ private:
|
|||
|
||||
class BufferedSocketBase : public Socket {
|
||||
public:
|
||||
virtual ErrorOr<size_t> read_line(Bytes buffer) = 0;
|
||||
virtual ErrorOr<StringView> read_line(Bytes buffer) = 0;
|
||||
virtual ErrorOr<Bytes> read_until(Bytes buffer, StringView candidate) = 0;
|
||||
virtual ErrorOr<bool> can_read_line() = 0;
|
||||
virtual size_t buffer_size() const = 0;
|
||||
|
@ -838,7 +838,7 @@ public:
|
|||
virtual ErrorOr<void> set_close_on_exec(bool enabled) override { return m_helper.stream().set_close_on_exec(enabled); }
|
||||
virtual void set_notifications_enabled(bool enabled) override { m_helper.stream().set_notifications_enabled(enabled); }
|
||||
|
||||
virtual ErrorOr<size_t> read_line(Bytes buffer) override { return m_helper.read_line(move(buffer)); }
|
||||
virtual ErrorOr<StringView> read_line(Bytes buffer) override { return m_helper.read_line(move(buffer)); }
|
||||
virtual ErrorOr<Bytes> read_until(Bytes buffer, StringView candidate) override { return m_helper.read_until(move(buffer), move(candidate)); }
|
||||
template<size_t N>
|
||||
ErrorOr<Bytes> read_until_any_of(Bytes buffer, Array<StringView, N> candidates) { return m_helper.read_until_any_of(move(buffer), move(candidates)); }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue