From 07f444439ce0071f0f005d72065c2b76f8d68841 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Sat, 5 Feb 2022 20:18:07 +0330 Subject: [PATCH] LibCore: Take StringViews by value in Stream::* function arguments --- Userland/Libraries/LibCore/Stream.cpp | 4 ++-- Userland/Libraries/LibCore/Stream.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Userland/Libraries/LibCore/Stream.cpp b/Userland/Libraries/LibCore/Stream.cpp index 5a8ba56e05..21988042b3 100644 --- a/Userland/Libraries/LibCore/Stream.cpp +++ b/Userland/Libraries/LibCore/Stream.cpp @@ -91,7 +91,7 @@ ErrorOr SeekableStream::size() return seek_result.value(); } -ErrorOr> File::open(StringView const& filename, OpenMode mode, mode_t permissions) +ErrorOr> File::open(StringView filename, OpenMode mode, mode_t permissions) { auto file = TRY(adopt_nonnull_own_or_enomem(new (nothrow) File(mode))); TRY(file->open_path(filename, permissions)); @@ -114,7 +114,7 @@ ErrorOr> File::adopt_fd(int fd, OpenMode mode) return file; } -ErrorOr File::open_path(StringView const& filename, mode_t permissions) +ErrorOr File::open_path(StringView filename, mode_t permissions) { VERIFY(m_fd == -1); diff --git a/Userland/Libraries/LibCore/Stream.h b/Userland/Libraries/LibCore/Stream.h index f5ae204fde..0e04e5153f 100644 --- a/Userland/Libraries/LibCore/Stream.h +++ b/Userland/Libraries/LibCore/Stream.h @@ -166,7 +166,7 @@ class File final : public SeekableStream { AK_MAKE_NONCOPYABLE(File); public: - static ErrorOr> open(StringView const& filename, OpenMode, mode_t = 0644); + static ErrorOr> open(StringView filename, OpenMode, mode_t = 0644); static ErrorOr> adopt_fd(int fd, OpenMode); File(File&& other) { operator=(move(other)); } @@ -199,7 +199,7 @@ private: { } - ErrorOr open_path(StringView const& filename, mode_t); + ErrorOr open_path(StringView filename, mode_t); OpenMode m_mode { OpenMode::NotOpen }; int m_fd { -1 }; @@ -542,7 +542,7 @@ public: return read_until(buffer, "\n"sv); } - ErrorOr read_until(Bytes buffer, StringView const& candidate) + ErrorOr read_until(Bytes buffer, StringView candidate) { return read_until_any_of(buffer, Array { candidate }); } @@ -724,7 +724,7 @@ public: } ErrorOr read_line(Bytes buffer) { return m_helper.read_line(move(buffer)); } - ErrorOr read_until(Bytes buffer, StringView const& candidate) { return m_helper.read_until(move(buffer), move(candidate)); } + ErrorOr read_until(Bytes buffer, StringView candidate) { return m_helper.read_until(move(buffer), move(candidate)); } template ErrorOr read_until_any_of(Bytes buffer, Array candidates) { return m_helper.read_until_any_of(move(buffer), move(candidates)); } ErrorOr can_read_line() { return m_helper.can_read_line(); } @@ -745,7 +745,7 @@ private: class BufferedSocketBase : public Socket { public: virtual ErrorOr read_line(Bytes buffer) = 0; - virtual ErrorOr read_until(Bytes buffer, StringView const& candidate) = 0; + virtual ErrorOr read_until(Bytes buffer, StringView candidate) = 0; virtual ErrorOr can_read_line() = 0; virtual size_t buffer_size() const = 0; }; @@ -789,7 +789,7 @@ public: virtual ErrorOr set_close_on_exec(bool enabled) override { return m_helper.stream().set_close_on_exec(enabled); } virtual ErrorOr read_line(Bytes buffer) override { return m_helper.read_line(move(buffer)); } - virtual ErrorOr read_until(Bytes buffer, StringView const& candidate) override { return m_helper.read_until(move(buffer), move(candidate)); } + virtual ErrorOr read_until(Bytes buffer, StringView candidate) override { return m_helper.read_until(move(buffer), move(candidate)); } template ErrorOr read_until_any_of(Bytes buffer, Array candidates) { return m_helper.read_until_any_of(move(buffer), move(candidates)); } virtual ErrorOr can_read_line() override { return m_helper.can_read_line(); }