From 8c34959b53b2b72122fe6d2718d5dc060ff56875 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Wed, 3 May 2023 18:45:18 -0400 Subject: [PATCH] AK: Add the `Input` word to input-only buffered streams This concerns both `BufferedSeekable` and `BufferedFile`. --- AK/BufferedStream.h | 18 +++++++-------- Ladybird/WebContent/main.cpp | 4 ++-- Ladybird/main.cpp | 2 +- .../LibLocale/GenerateDateTimeFormatData.cpp | 4 ++-- .../LibLocale/GenerateLocaleData.cpp | 4 ++-- .../LibLocale/GenerateNumberFormatData.cpp | 4 ++-- .../LibLocale/GeneratePluralRulesData.cpp | 4 ++-- .../GenerateRelativeTimeFormatData.cpp | 4 ++-- .../LibTimeZone/GenerateTimeZoneData.cpp | 6 ++--- .../LibUnicode/GenerateEmojiData.cpp | 10 ++++----- .../LibUnicode/GenerateUnicodeData.cpp | 22 +++++++++---------- .../CodeGenerators/LibUnicode/GeneratorUtil.h | 4 ++-- Meta/Lagom/Tools/IPCMagicLinter/main.cpp | 4 ++-- Tests/LibCore/TestLibCoreStream.cpp | 8 +++---- Tests/LibJS/test262-runner.cpp | 2 +- .../3DFileViewer/WavefrontOBJLoader.cpp | 2 +- Userland/Applications/Browser/main.cpp | 4 ++-- .../ContentFilterSettingsWidget.cpp | 2 +- .../FileOperationProgressWidget.cpp | 2 +- .../FileManager/FileOperationProgressWidget.h | 4 ++-- .../Applications/FileManager/FileUtils.cpp | 2 +- .../Applications/PixelPaint/PaletteWidget.cpp | 2 +- Userland/Applications/Run/RunWindow.cpp | 2 +- .../Applications/Welcome/WelcomeWidget.cpp | 2 +- Userland/DevTools/Profiler/SourceModel.cpp | 2 +- Userland/Games/MasterWord/WordGame.cpp | 2 +- Userland/Libraries/LibAudio/FlacLoader.cpp | 2 +- Userland/Libraries/LibAudio/MP3Loader.cpp | 2 +- Userland/Libraries/LibAudio/QOALoader.cpp | 2 +- Userland/Libraries/LibAudio/WavLoader.cpp | 2 +- Userland/Libraries/LibChess/UCIEndpoint.h | 4 ++-- Userland/Libraries/LibCompress/Gzip.cpp | 2 +- Userland/Libraries/LibCore/ConfigFile.cpp | 8 +++---- Userland/Libraries/LibCore/ConfigFile.h | 4 ++-- Userland/Libraries/LibCore/DeprecatedFile.h | 2 +- Userland/Libraries/LibCore/File.h | 2 +- Userland/Libraries/LibSQL/Heap.cpp | 2 +- Userland/Libraries/LibSQL/Heap.h | 2 +- Userland/Shell/Builtin.cpp | 2 +- Userland/Utilities/cmp.cpp | 4 ++-- Userland/Utilities/comm.cpp | 6 ++--- Userland/Utilities/grep.cpp | 4 ++-- Userland/Utilities/lzcat.cpp | 2 +- Userland/Utilities/mount.cpp | 2 +- Userland/Utilities/sed.cpp | 11 +++++----- Userland/Utilities/sort.cpp | 2 +- Userland/Utilities/sql.cpp | 4 ++-- Userland/Utilities/tar.cpp | 2 +- Userland/Utilities/uniq.cpp | 2 +- Userland/Utilities/xzcat.cpp | 2 +- 50 files changed, 101 insertions(+), 102 deletions(-) diff --git a/AK/BufferedStream.h b/AK/BufferedStream.h index 927c3db4d9a..f0342e31eea 100644 --- a/AK/BufferedStream.h +++ b/AK/BufferedStream.h @@ -264,17 +264,17 @@ private: // needed at the moment. template -class BufferedSeekable final : public SeekableStream { +class InputBufferedSeekable final : public SeekableStream { friend BufferedHelper; public: - static ErrorOr>> create(NonnullOwnPtr stream, size_t buffer_size = 16384) + static ErrorOr>> create(NonnullOwnPtr stream, size_t buffer_size = 16384) { - return BufferedHelper::template create_buffered(move(stream), buffer_size); + return BufferedHelper::template create_buffered(move(stream), buffer_size); } - BufferedSeekable(BufferedSeekable&& other) = default; - BufferedSeekable& operator=(BufferedSeekable&& other) = default; + InputBufferedSeekable(InputBufferedSeekable&& other) = default; + InputBufferedSeekable& operator=(InputBufferedSeekable&& other) = default; virtual ErrorOr read_some(Bytes buffer) override { return m_helper.read(move(buffer)); } virtual ErrorOr write_some(ReadonlyBytes buffer) override { return m_helper.stream().write_some(buffer); } @@ -311,11 +311,11 @@ public: size_t buffer_size() const { return m_helper.buffer_size(); } - virtual ~BufferedSeekable() override = default; + virtual ~InputBufferedSeekable() override = default; private: - BufferedSeekable(NonnullOwnPtr stream, CircularBuffer buffer) - : m_helper(Badge> {}, move(stream), move(buffer)) + InputBufferedSeekable(NonnullOwnPtr stream, CircularBuffer buffer) + : m_helper(Badge> {}, move(stream), move(buffer)) { } @@ -326,5 +326,5 @@ private: #if USING_AK_GLOBALLY using AK::BufferedHelper; -using AK::BufferedSeekable; +using AK::InputBufferedSeekable; #endif diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index 6ab5eec969f..ee35a2b2585 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -102,7 +102,7 @@ static ErrorOr load_content_filters() return file_or_error.release_error(); auto file = file_or_error.release_value(); - auto ad_filter_list = TRY(Core::BufferedFile::create(move(file))); + auto ad_filter_list = TRY(Core::InputBufferedFile::create(move(file))); auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); Vector patterns; @@ -131,7 +131,7 @@ static ErrorOr load_autoplay_allowlist() return file_or_error.release_error(); auto file = file_or_error.release_value(); - auto allowlist = TRY(Core::BufferedFile::create(move(file))); + auto allowlist = TRY(Core::InputBufferedFile::create(move(file))); auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); Vector origins; diff --git a/Ladybird/main.cpp b/Ladybird/main.cpp index e1cc780002e..2b1f802d881 100644 --- a/Ladybird/main.cpp +++ b/Ladybird/main.cpp @@ -32,7 +32,7 @@ static ErrorOr handle_attached_debugger() // "nopass". See https://sourceware.org/bugzilla/show_bug.cgi?id=9425 // for details. auto unbuffered_status_file = TRY(Core::File::open("/proc/self/status"sv, Core::File::OpenMode::Read)); - auto status_file = TRY(Core::BufferedFile::create(move(unbuffered_status_file))); + auto status_file = TRY(Core::InputBufferedFile::create(move(unbuffered_status_file))); auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); while (TRY(status_file->can_read_line())) { auto line = TRY(status_file->read_line(buffer)); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp index 88611ed8561..f3569cde5ca 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp @@ -1699,7 +1699,7 @@ static DeprecatedString format_identifier(StringView owner, DeprecatedString ide return identifier; } -static ErrorOr generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_header(Core::InputBufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -1727,7 +1727,7 @@ namespace Locale { return {}; } -static ErrorOr generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_implementation(Core::InputBufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp index 99ffa151789..2db514e77ad 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp @@ -1058,7 +1058,7 @@ static ErrorOr parse_all_locales(DeprecatedString bcp47_path, DeprecatedSt return {}; } -static ErrorOr generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_header(Core::InputBufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -1103,7 +1103,7 @@ namespace Locale { return {}; } -static ErrorOr generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_implementation(Core::InputBufferedFile& file, CLDR& cldr) { auto string_index_type = cldr.unique_strings.type_that_fits(); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp index b8a1d17501a..cd460830c54 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp @@ -743,7 +743,7 @@ static DeprecatedString format_identifier(StringView, DeprecatedString identifie return identifier.to_titlecase(); } -static ErrorOr generate_unicode_locale_header(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_header(Core::InputBufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; @@ -766,7 +766,7 @@ namespace Locale { return {}; } -static ErrorOr generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_implementation(Core::InputBufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp index c0908738daa..92f5da07731 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp @@ -425,7 +425,7 @@ static ErrorOr parse_all_locales(DeprecatedString core_path, DeprecatedStr return {}; } -static ErrorOr generate_unicode_locale_header(Core::BufferedFile& file, CLDR&) +static ErrorOr generate_unicode_locale_header(Core::InputBufferedFile& file, CLDR&) { StringBuilder builder; SourceGenerator generator { builder }; @@ -446,7 +446,7 @@ namespace Locale { return {}; } -static ErrorOr generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_implementation(Core::InputBufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp index ed96225bad8..f1d7eca9693 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp @@ -162,7 +162,7 @@ static ErrorOr parse_all_locales(DeprecatedString dates_path, CLDR& cldr) return {}; } -static ErrorOr generate_unicode_locale_header(Core::BufferedFile& file, CLDR&) +static ErrorOr generate_unicode_locale_header(Core::InputBufferedFile& file, CLDR&) { StringBuilder builder; SourceGenerator generator { builder }; @@ -183,7 +183,7 @@ namespace Locale { return {}; } -static ErrorOr generate_unicode_locale_implementation(Core::BufferedFile& file, CLDR& cldr) +static ErrorOr generate_unicode_locale_implementation(Core::InputBufferedFile& file, CLDR& cldr) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp index b93aa98174b..16d7049af41 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp @@ -345,7 +345,7 @@ static ErrorOr parse_time_zones(StringView time_zone_path, TimeZoneData& t return {}; } -static ErrorOr parse_time_zone_coordinates(Core::BufferedFile& file, TimeZoneData& time_zone_data) +static ErrorOr parse_time_zone_coordinates(Core::InputBufferedFile& file, TimeZoneData& time_zone_data) { auto parse_coordinate = [](auto coordinate) { VERIFY(coordinate.substring_view(0, 1).is_one_of("+"sv, "-"sv)); @@ -448,7 +448,7 @@ static DeprecatedString format_identifier(StringView owner, DeprecatedString ide return identifier; } -static ErrorOr generate_time_zone_data_header(Core::BufferedFile& file, TimeZoneData& time_zone_data) +static ErrorOr generate_time_zone_data_header(Core::InputBufferedFile& file, TimeZoneData& time_zone_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -473,7 +473,7 @@ namespace TimeZone { return {}; } -static ErrorOr generate_time_zone_data_implementation(Core::BufferedFile& file, TimeZoneData& time_zone_data) +static ErrorOr generate_time_zone_data_implementation(Core::InputBufferedFile& file, TimeZoneData& time_zone_data) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp index e9adbab855f..b3870744ce2 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateEmojiData.cpp @@ -53,7 +53,7 @@ static void set_image_path_for_emoji(StringView emoji_resource_path, EmojiData& emoji.image_path = emoji_data.unique_strings.ensure(move(file)); } -static ErrorOr parse_emoji_test_data(Core::BufferedFile& file, EmojiData& emoji_data) +static ErrorOr parse_emoji_test_data(Core::InputBufferedFile& file, EmojiData& emoji_data) { static constexpr auto group_header = "# group: "sv; static constexpr auto subgroup_header = "# subgroup: "sv; @@ -117,7 +117,7 @@ static ErrorOr parse_emoji_test_data(Core::BufferedFile& file, EmojiData& return {}; } -static ErrorOr parse_emoji_serenity_data(Core::BufferedFile& file, EmojiData& emoji_data) +static ErrorOr parse_emoji_serenity_data(Core::InputBufferedFile& file, EmojiData& emoji_data) { static constexpr auto code_point_header = "U+"sv; @@ -203,7 +203,7 @@ static ErrorOr validate_emoji(StringView emoji_resource_path, EmojiData& e return {}; } -static ErrorOr generate_emoji_data_header(Core::BufferedFile& file, EmojiData const&) +static ErrorOr generate_emoji_data_header(Core::InputBufferedFile& file, EmojiData const&) { StringBuilder builder; SourceGenerator generator { builder }; @@ -212,7 +212,7 @@ static ErrorOr generate_emoji_data_header(Core::BufferedFile& file, EmojiD return {}; } -static ErrorOr generate_emoji_data_implementation(Core::BufferedFile& file, EmojiData const& emoji_data) +static ErrorOr generate_emoji_data_implementation(Core::InputBufferedFile& file, EmojiData const& emoji_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -333,7 +333,7 @@ Optional find_emoji_for_code_points(ReadonlySpan code_points) return {}; } -static ErrorOr generate_emoji_installation(Core::BufferedFile& file, EmojiData const& emoji_data) +static ErrorOr generate_emoji_installation(Core::InputBufferedFile& file, EmojiData const& emoji_data) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp index 31c984dab6e..ba041d68b96 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp @@ -218,7 +218,7 @@ static CodePointRange parse_code_point_range(StringView list) return code_point_range; } -static ErrorOr parse_special_casing(Core::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr parse_special_casing(Core::InputBufferedFile& file, UnicodeData& unicode_data) { Array buffer; @@ -289,7 +289,7 @@ static ErrorOr parse_special_casing(Core::BufferedFile& file, UnicodeData& return {}; } -static ErrorOr parse_case_folding(Core::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr parse_case_folding(Core::InputBufferedFile& file, UnicodeData& unicode_data) { Array buffer; @@ -337,7 +337,7 @@ static ErrorOr parse_case_folding(Core::BufferedFile& file, UnicodeData& u return {}; } -static ErrorOr parse_prop_list(Core::BufferedFile& file, PropList& prop_list, bool multi_value_property = false, bool sanitize_property = false) +static ErrorOr parse_prop_list(Core::InputBufferedFile& file, PropList& prop_list, bool multi_value_property = false, bool sanitize_property = false) { Array buffer; @@ -370,7 +370,7 @@ static ErrorOr parse_prop_list(Core::BufferedFile& file, PropList& prop_li return {}; } -static ErrorOr parse_alias_list(Core::BufferedFile& file, PropList const& prop_list, Vector& prop_aliases) +static ErrorOr parse_alias_list(Core::InputBufferedFile& file, PropList const& prop_list, Vector& prop_aliases) { DeprecatedString current_property; Array buffer; @@ -416,7 +416,7 @@ static ErrorOr parse_alias_list(Core::BufferedFile& file, PropList const& return {}; } -static ErrorOr parse_name_aliases(Core::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr parse_name_aliases(Core::InputBufferedFile& file, UnicodeData& unicode_data) { Array buffer; @@ -447,7 +447,7 @@ static ErrorOr parse_name_aliases(Core::BufferedFile& file, UnicodeData& u return {}; } -static ErrorOr parse_value_alias_list(Core::BufferedFile& file, StringView desired_category, Vector const& value_list, Vector& prop_aliases, bool primary_value_is_first = true, bool sanitize_alias = false) +static ErrorOr parse_value_alias_list(Core::InputBufferedFile& file, StringView desired_category, Vector const& value_list, Vector& prop_aliases, bool primary_value_is_first = true, bool sanitize_alias = false) { TRY(file.seek(0, SeekMode::SetPosition)); Array buffer; @@ -493,7 +493,7 @@ static ErrorOr parse_value_alias_list(Core::BufferedFile& file, StringView return {}; } -static ErrorOr parse_normalization_props(Core::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr parse_normalization_props(Core::InputBufferedFile& file, UnicodeData& unicode_data) { Array buffer; @@ -627,7 +627,7 @@ static Optional parse_decomposition_mapping(StringView s return mapping; } -static ErrorOr parse_block_display_names(Core::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr parse_block_display_names(Core::InputBufferedFile& file, UnicodeData& unicode_data) { Array buffer; while (TRY(file.can_read_line())) { @@ -650,7 +650,7 @@ static ErrorOr parse_block_display_names(Core::BufferedFile& file, Unicode return {}; } -static ErrorOr parse_unicode_data(Core::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr parse_unicode_data(Core::InputBufferedFile& file, UnicodeData& unicode_data) { Optional code_point_range_start; @@ -755,7 +755,7 @@ static ErrorOr parse_unicode_data(Core::BufferedFile& file, UnicodeData& u return {}; } -static ErrorOr generate_unicode_data_header(Core::BufferedFile& file, UnicodeData& unicode_data) +static ErrorOr generate_unicode_data_header(Core::InputBufferedFile& file, UnicodeData& unicode_data) { StringBuilder builder; SourceGenerator generator { builder }; @@ -870,7 +870,7 @@ ReadonlySpan case_folding_mapping(u32 code_point); return {}; } -static ErrorOr generate_unicode_data_implementation(Core::BufferedFile& file, UnicodeData const& unicode_data) +static ErrorOr generate_unicode_data_implementation(Core::InputBufferedFile& file, UnicodeData const& unicode_data) { StringBuilder builder; SourceGenerator generator { builder }; diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h index 9e2a3c292c9..5e16263cd47 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h @@ -323,13 +323,13 @@ struct CanonicalLanguageID { Vector variants {}; }; -inline ErrorOr> open_file(StringView path, Core::File::OpenMode mode) +inline ErrorOr> open_file(StringView path, Core::File::OpenMode mode) { if (path.is_empty()) return Error::from_string_literal("Provided path is empty, please provide all command line options"); auto file = TRY(Core::File::open(path, mode)); - return Core::BufferedFile::create(move(file)); + return Core::InputBufferedFile::create(move(file)); } inline ErrorOr read_json_file(StringView path) diff --git a/Meta/Lagom/Tools/IPCMagicLinter/main.cpp b/Meta/Lagom/Tools/IPCMagicLinter/main.cpp index cdfcd376082..ed9aed4164d 100644 --- a/Meta/Lagom/Tools/IPCMagicLinter/main.cpp +++ b/Meta/Lagom/Tools/IPCMagicLinter/main.cpp @@ -27,9 +27,9 @@ ErrorOr serenity_main(Main::Arguments arguments) bool had_errors = false; for (auto filename : arguments.strings.slice(1)) { - auto const open_file = [](StringView filename) -> ErrorOr> { + auto const open_file = [](StringView filename) -> ErrorOr> { auto file = TRY(Core::File::open(filename, Core::File::OpenMode::Read)); - return Core::BufferedFile::create(move(file)); + return Core::InputBufferedFile::create(move(file)); }; auto file_or_error = open_file(filename); diff --git a/Tests/LibCore/TestLibCoreStream.cpp b/Tests/LibCore/TestLibCoreStream.cpp index 0a81955fa7d..3ee97091a12 100644 --- a/Tests/LibCore/TestLibCoreStream.cpp +++ b/Tests/LibCore/TestLibCoreStream.cpp @@ -422,7 +422,7 @@ TEST_CASE(buffered_long_file_read) { auto maybe_file = Core::File::open("/usr/Tests/LibCore/long_lines.txt"sv, Core::File::OpenMode::Read); EXPECT(!maybe_file.is_error()); - auto maybe_buffered_file = Core::BufferedFile::create(maybe_file.release_value()); + auto maybe_buffered_file = Core::InputBufferedFile::create(maybe_file.release_value()); EXPECT(!maybe_buffered_file.is_error()); auto file = maybe_buffered_file.release_value(); @@ -444,7 +444,7 @@ TEST_CASE(buffered_small_file_read) { auto maybe_file = Core::File::open("/usr/Tests/LibCore/small.txt"sv, Core::File::OpenMode::Read); EXPECT(!maybe_file.is_error()); - auto maybe_buffered_file = Core::BufferedFile::create(maybe_file.release_value()); + auto maybe_buffered_file = Core::InputBufferedFile::create(maybe_file.release_value()); EXPECT(!maybe_buffered_file.is_error()); auto file = maybe_buffered_file.release_value(); @@ -472,7 +472,7 @@ TEST_CASE(buffered_file_tell_and_seek) { // We choose a buffer size of 12 bytes to cover half of the input file. auto file = Core::File::open("/usr/Tests/LibCore/small.txt"sv, Core::File::OpenMode::Read).release_value(); - auto buffered_file = Core::BufferedFile::create(move(file), 12).release_value(); + auto buffered_file = Core::InputBufferedFile::create(move(file), 12).release_value(); // Initial state. { @@ -562,7 +562,7 @@ TEST_CASE(buffered_file_without_newlines) EXPECT(!file_wo_newlines->write_until_depleted(new_newlines_message.bytes()).is_error()); file_wo_newlines->close(); - auto ro_file = Core::BufferedFile::create(Core::File::open(filename, Core::File::OpenMode::Read).release_value(), new_newlines_message.length() + 1).release_value(); + auto ro_file = Core::InputBufferedFile::create(Core::File::open(filename, Core::File::OpenMode::Read).release_value(), new_newlines_message.length() + 1).release_value(); auto maybe_can_read_line = ro_file->can_read_line(); EXPECT(!maybe_can_read_line.is_error()); diff --git a/Tests/LibJS/test262-runner.cpp b/Tests/LibJS/test262-runner.cpp index 4747b44c943..bba6bc56af6 100644 --- a/Tests/LibJS/test262-runner.cpp +++ b/Tests/LibJS/test262-runner.cpp @@ -695,7 +695,7 @@ int main(int argc, char** argv) return exit_setup_input_failure; Array input_buffer {}; - auto buffered_standard_input_or_error = Core::BufferedFile::create(standard_input_or_error.release_value()); + auto buffered_standard_input_or_error = Core::InputBufferedFile::create(standard_input_or_error.release_value()); if (buffered_standard_input_or_error.is_error()) return exit_setup_input_failure; diff --git a/Userland/Applications/3DFileViewer/WavefrontOBJLoader.cpp b/Userland/Applications/3DFileViewer/WavefrontOBJLoader.cpp index 6b0720e4b10..a2c0b3943ca 100644 --- a/Userland/Applications/3DFileViewer/WavefrontOBJLoader.cpp +++ b/Userland/Applications/3DFileViewer/WavefrontOBJLoader.cpp @@ -19,7 +19,7 @@ static inline GLuint get_index_value(StringView& representation) ErrorOr> WavefrontOBJLoader::load(String const& filename, NonnullOwnPtr file) { - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); Vector vertices; Vector normals; diff --git a/Userland/Applications/Browser/main.cpp b/Userland/Applications/Browser/main.cpp index 6a8127c32dc..a9c30e0f136 100644 --- a/Userland/Applications/Browser/main.cpp +++ b/Userland/Applications/Browser/main.cpp @@ -48,7 +48,7 @@ DeprecatedString g_webdriver_content_ipc_path; static ErrorOr load_content_filters() { auto file = TRY(Core::File::open(TRY(String::formatted("{}/BrowserContentFilters.txt", Core::StandardPaths::config_directory())), Core::File::OpenMode::Read)); - auto ad_filter_list = TRY(Core::BufferedFile::create(move(file))); + auto ad_filter_list = TRY(Core::InputBufferedFile::create(move(file))); auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); Browser::g_content_filters.clear_with_capacity(); @@ -68,7 +68,7 @@ static ErrorOr load_content_filters() static ErrorOr load_autoplay_allowlist() { auto file = TRY(Core::File::open(TRY(String::formatted("{}/BrowserAutoplayAllowlist.txt", Core::StandardPaths::config_directory())), Core::File::OpenMode::Read)); - auto allowlist = TRY(Core::BufferedFile::create(move(file))); + auto allowlist = TRY(Core::InputBufferedFile::create(move(file))); auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); Browser::g_autoplay_allowlist.clear_with_capacity(); diff --git a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp index 7ea4c723cc0..116c6595473 100644 --- a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp +++ b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp @@ -29,7 +29,7 @@ ErrorOr DomainListModel::load() { // FIXME: This should be somewhat shared with Browser. auto file = TRY(Core::File::open(TRY(filter_list_file_path()), Core::File::OpenMode::Read)); - auto content_filter_list = TRY(Core::BufferedFile::create(move(file))); + auto content_filter_list = TRY(Core::InputBufferedFile::create(move(file))); auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); m_domain_list.clear_with_capacity(); diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp index 3dc21046f86..0f9a71a7ecb 100644 --- a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp +++ b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp @@ -18,7 +18,7 @@ namespace FileManager { -FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation, NonnullOwnPtr helper_pipe, int helper_pipe_fd) +FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation, NonnullOwnPtr helper_pipe, int helper_pipe_fd) : m_operation(operation) , m_helper_pipe(move(helper_pipe)) { diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.h b/Userland/Applications/FileManager/FileOperationProgressWidget.h index d5aca5e42f3..79f07d51db6 100644 --- a/Userland/Applications/FileManager/FileOperationProgressWidget.h +++ b/Userland/Applications/FileManager/FileOperationProgressWidget.h @@ -21,7 +21,7 @@ public: private: // FIXME: The helper_pipe_fd parameter is only needed because we can't get the fd from a Core::Stream. - FileOperationProgressWidget(FileOperation, NonnullOwnPtr helper_pipe, int helper_pipe_fd); + FileOperationProgressWidget(FileOperation, NonnullOwnPtr helper_pipe, int helper_pipe_fd); void did_finish(); void did_error(StringView message); @@ -34,6 +34,6 @@ private: FileOperation m_operation; RefPtr m_notifier; - OwnPtr m_helper_pipe; + OwnPtr m_helper_pipe; }; } diff --git a/Userland/Applications/FileManager/FileUtils.cpp b/Userland/Applications/FileManager/FileUtils.cpp index 17e19ace383..249d9cff61c 100644 --- a/Userland/Applications/FileManager/FileUtils.cpp +++ b/Userland/Applications/FileManager/FileUtils.cpp @@ -99,7 +99,7 @@ ErrorOr run_file_operation(FileOperation operation, Vectorset_main_widget(operation, move(buffered_pipe), pipe_fds[0])); window->resize(320, 190); diff --git a/Userland/Applications/PixelPaint/PaletteWidget.cpp b/Userland/Applications/PixelPaint/PaletteWidget.cpp index d8454d2e5c6..a6d8d5c351b 100644 --- a/Userland/Applications/PixelPaint/PaletteWidget.cpp +++ b/Userland/Applications/PixelPaint/PaletteWidget.cpp @@ -215,7 +215,7 @@ ErrorOr> PaletteWidget::load_palette_file(NonnullOwnPtr palette; Array buffer; - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); while (TRY(buffered_file->can_read_line())) { auto line = TRY(buffered_file->read_line(buffer)); diff --git a/Userland/Applications/Run/RunWindow.cpp b/Userland/Applications/Run/RunWindow.cpp index fa06057f834..511f9af7296 100644 --- a/Userland/Applications/Run/RunWindow.cpp +++ b/Userland/Applications/Run/RunWindow.cpp @@ -169,7 +169,7 @@ ErrorOr RunWindow::load_history() { m_path_history.clear(); auto file = TRY(Core::File::open(history_file_path(), Core::File::OpenMode::Read)); - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); Array line_buffer; while (!buffered_file->is_eof()) { diff --git a/Userland/Applications/Welcome/WelcomeWidget.cpp b/Userland/Applications/Welcome/WelcomeWidget.cpp index 7241a5379f6..cf1c3a8c7bc 100644 --- a/Userland/Applications/Welcome/WelcomeWidget.cpp +++ b/Userland/Applications/Welcome/WelcomeWidget.cpp @@ -95,7 +95,7 @@ ErrorOr WelcomeWidget::open_and_parse_tips_file() { auto path = TRY(String::formatted("{}/tips.txt", Core::StandardPaths::documents_directory())); auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read)); - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); Array buffer; while (TRY(buffered_file->can_read_line())) { diff --git a/Userland/DevTools/Profiler/SourceModel.cpp b/Userland/DevTools/Profiler/SourceModel.cpp index d23691a1e31..12fdd29a914 100644 --- a/Userland/DevTools/Profiler/SourceModel.cpp +++ b/Userland/DevTools/Profiler/SourceModel.cpp @@ -29,7 +29,7 @@ public: auto try_read_lines = [&]() -> ErrorOr { auto unbuffered_file = TRY(Core::File::open(source_file_name, Core::File::OpenMode::Read)); - auto file = TRY(Core::BufferedFile::create(move(unbuffered_file))); + auto file = TRY(Core::InputBufferedFile::create(move(unbuffered_file))); Array buffer; while (!file->is_eof()) diff --git a/Userland/Games/MasterWord/WordGame.cpp b/Userland/Games/MasterWord/WordGame.cpp index 3192faae80b..0e30a336ca3 100644 --- a/Userland/Games/MasterWord/WordGame.cpp +++ b/Userland/Games/MasterWord/WordGame.cpp @@ -178,7 +178,7 @@ void WordGame::read_words() auto try_load_words = [&]() -> ErrorOr { auto response = TRY(Core::File::open("/res/words.txt"sv, Core::File::OpenMode::Read)); - auto words_file = TRY(Core::BufferedFile::create(move(response))); + auto words_file = TRY(Core::InputBufferedFile::create(move(response))); Array buffer; while (!words_file->is_eof()) { diff --git a/Userland/Libraries/LibAudio/FlacLoader.cpp b/Userland/Libraries/LibAudio/FlacLoader.cpp index 4f23b7a7097..851fda7137c 100644 --- a/Userland/Libraries/LibAudio/FlacLoader.cpp +++ b/Userland/Libraries/LibAudio/FlacLoader.cpp @@ -34,7 +34,7 @@ FlacLoaderPlugin::FlacLoaderPlugin(NonnullOwnPtr stream) Result, LoaderError> FlacLoaderPlugin::create(StringView path) { - auto stream = LOADER_TRY(Core::BufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); + auto stream = LOADER_TRY(Core::InputBufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); auto loader = make(move(stream)); LOADER_TRY(loader->initialize()); diff --git a/Userland/Libraries/LibAudio/MP3Loader.cpp b/Userland/Libraries/LibAudio/MP3Loader.cpp index f3131ea2e7f..b73dc28dc24 100644 --- a/Userland/Libraries/LibAudio/MP3Loader.cpp +++ b/Userland/Libraries/LibAudio/MP3Loader.cpp @@ -23,7 +23,7 @@ MP3LoaderPlugin::MP3LoaderPlugin(NonnullOwnPtr stream) Result, LoaderError> MP3LoaderPlugin::create(StringView path) { - auto stream = LOADER_TRY(Core::BufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); + auto stream = LOADER_TRY(Core::InputBufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); auto loader = make(move(stream)); LOADER_TRY(loader->initialize()); diff --git a/Userland/Libraries/LibAudio/QOALoader.cpp b/Userland/Libraries/LibAudio/QOALoader.cpp index 68acf2eb963..bca3cb26018 100644 --- a/Userland/Libraries/LibAudio/QOALoader.cpp +++ b/Userland/Libraries/LibAudio/QOALoader.cpp @@ -26,7 +26,7 @@ QOALoaderPlugin::QOALoaderPlugin(NonnullOwnPtr stream) Result, LoaderError> QOALoaderPlugin::create(StringView path) { - auto stream = LOADER_TRY(Core::BufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); + auto stream = LOADER_TRY(Core::InputBufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); auto loader = make(move(stream)); LOADER_TRY(loader->initialize()); diff --git a/Userland/Libraries/LibAudio/WavLoader.cpp b/Userland/Libraries/LibAudio/WavLoader.cpp index 8abb2cb8fa6..c4adf379b45 100644 --- a/Userland/Libraries/LibAudio/WavLoader.cpp +++ b/Userland/Libraries/LibAudio/WavLoader.cpp @@ -26,7 +26,7 @@ WavLoaderPlugin::WavLoaderPlugin(NonnullOwnPtr stream) Result, LoaderError> WavLoaderPlugin::create(StringView path) { - auto stream = LOADER_TRY(Core::BufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); + auto stream = LOADER_TRY(Core::InputBufferedFile::create(LOADER_TRY(Core::File::open(path, Core::File::OpenMode::Read)))); auto loader = make(move(stream)); LOADER_TRY(loader->initialize()); diff --git a/Userland/Libraries/LibChess/UCIEndpoint.h b/Userland/Libraries/LibChess/UCIEndpoint.h index 8c2104162ba..b7b617547fa 100644 --- a/Userland/Libraries/LibChess/UCIEndpoint.h +++ b/Userland/Libraries/LibChess/UCIEndpoint.h @@ -44,7 +44,7 @@ public: ErrorOr set_in(NonnullOwnPtr in) { m_in_fd = in->fd(); - m_in = TRY(Core::BufferedFile::create(move(in))); + m_in = TRY(Core::InputBufferedFile::create(move(in))); set_in_notifier(); return {}; } @@ -62,7 +62,7 @@ private: ErrorOr> read_command(StringView line) const; Optional m_in_fd {}; - OwnPtr m_in; + OwnPtr m_in; OwnPtr m_out; RefPtr m_in_notifier; }; diff --git a/Userland/Libraries/LibCompress/Gzip.cpp b/Userland/Libraries/LibCompress/Gzip.cpp index 5f00fbd683e..3b5986f8cee 100644 --- a/Userland/Libraries/LibCompress/Gzip.cpp +++ b/Userland/Libraries/LibCompress/Gzip.cpp @@ -185,7 +185,7 @@ ErrorOr GzipDecompressor::decompress_all(ReadonlyBytes bytes) ErrorOr GzipDecompressor::decompress_file(StringView input_filename, NonnullOwnPtr output_stream) { auto input_file = TRY(Core::File::open(input_filename, Core::File::OpenMode::Read)); - auto input_stream = TRY(Core::BufferedFile::create(move(input_file), 256 * KiB)); + auto input_stream = TRY(Core::InputBufferedFile::create(move(input_file), 256 * KiB)); auto gzip_stream = GzipDecompressor { move(input_stream) }; auto buffer = TRY(ByteBuffer::create_uninitialized(256 * KiB)); diff --git a/Userland/Libraries/LibCore/ConfigFile.cpp b/Userland/Libraries/LibCore/ConfigFile.cpp index a302fd9b468..4086710f8c4 100644 --- a/Userland/Libraries/LibCore/ConfigFile.cpp +++ b/Userland/Libraries/LibCore/ConfigFile.cpp @@ -41,7 +41,7 @@ ErrorOr> ConfigFile::open_for_system(DeprecatedString ErrorOr> ConfigFile::open(DeprecatedString const& filename, AllowWriting allow_altering) { auto maybe_file = File::open(filename, allow_altering == AllowWriting::Yes ? File::OpenMode::ReadWrite : File::OpenMode::Read); - OwnPtr buffered_file; + OwnPtr buffered_file; if (maybe_file.is_error()) { // If we attempted to open a read-only file that does not exist, we ignore the error, making it appear // the same as if we had opened an empty file. This behavior is a little weird, but is required by @@ -49,7 +49,7 @@ ErrorOr> ConfigFile::open(DeprecatedString const& file if (!(allow_altering == AllowWriting::No && maybe_file.error().code() == ENOENT)) return maybe_file.release_error(); } else { - buffered_file = TRY(BufferedFile::create(maybe_file.release_value())); + buffered_file = TRY(InputBufferedFile::create(maybe_file.release_value())); } auto config_file = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ConfigFile(filename, move(buffered_file)))); @@ -65,14 +65,14 @@ ErrorOr> ConfigFile::open(DeprecatedString const& file ErrorOr> ConfigFile::open(DeprecatedString const& filename, NonnullOwnPtr file) { - auto buffered_file = TRY(BufferedFile::create(move(file))); + auto buffered_file = TRY(InputBufferedFile::create(move(file))); auto config_file = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ConfigFile(filename, move(buffered_file)))); TRY(config_file->reparse()); return config_file; } -ConfigFile::ConfigFile(DeprecatedString const& filename, OwnPtr open_file) +ConfigFile::ConfigFile(DeprecatedString const& filename, OwnPtr open_file) : m_filename(filename) , m_file(move(open_file)) { diff --git a/Userland/Libraries/LibCore/ConfigFile.h b/Userland/Libraries/LibCore/ConfigFile.h index c003fc6e568..b8e4fc246bb 100644 --- a/Userland/Libraries/LibCore/ConfigFile.h +++ b/Userland/Libraries/LibCore/ConfigFile.h @@ -79,12 +79,12 @@ public: DeprecatedString const& filename() const { return m_filename; } private: - ConfigFile(DeprecatedString const& filename, OwnPtr open_file); + ConfigFile(DeprecatedString const& filename, OwnPtr open_file); ErrorOr reparse(); DeprecatedString m_filename; - OwnPtr m_file; + OwnPtr m_file; HashMap> m_groups; bool m_dirty { false }; }; diff --git a/Userland/Libraries/LibCore/DeprecatedFile.h b/Userland/Libraries/LibCore/DeprecatedFile.h index ca5852dd49b..cd871b7822f 100644 --- a/Userland/Libraries/LibCore/DeprecatedFile.h +++ b/Userland/Libraries/LibCore/DeprecatedFile.h @@ -19,7 +19,7 @@ namespace Core { /// /// Use of Core::File for reading/writing data is deprecated. -/// Please use Core::File and Core::BufferedFile instead. +/// Please use Core::File and Core::InputBufferedFile instead. /// class DeprecatedFile final : public IODevice { C_OBJECT(DeprecatedFile) diff --git a/Userland/Libraries/LibCore/File.h b/Userland/Libraries/LibCore/File.h index 22be6a5ec5b..7a6728b9afe 100644 --- a/Userland/Libraries/LibCore/File.h +++ b/Userland/Libraries/LibCore/File.h @@ -105,6 +105,6 @@ private: AK_ENUM_BITWISE_OPERATORS(File::OpenMode) -using BufferedFile = BufferedSeekable; +using InputBufferedFile = InputBufferedSeekable; } diff --git a/Userland/Libraries/LibSQL/Heap.cpp b/Userland/Libraries/LibSQL/Heap.cpp index 42ebe954189..8425e1d43c9 100644 --- a/Userland/Libraries/LibSQL/Heap.cpp +++ b/Userland/Libraries/LibSQL/Heap.cpp @@ -48,7 +48,7 @@ ErrorOr Heap::open() } auto file = TRY(Core::File::open(name(), Core::File::OpenMode::ReadWrite)); - m_file = TRY(Core::BufferedFile::create(move(file))); + m_file = TRY(Core::InputBufferedFile::create(move(file))); if (file_size > 0) { if (auto error_maybe = read_zero_block(); error_maybe.is_error()) { diff --git a/Userland/Libraries/LibSQL/Heap.h b/Userland/Libraries/LibSQL/Heap.h index 08de5a59b8e..daf2363cb41 100644 --- a/Userland/Libraries/LibSQL/Heap.h +++ b/Userland/Libraries/LibSQL/Heap.h @@ -128,7 +128,7 @@ private: ErrorOr initialize_zero_block(); ErrorOr update_zero_block(); - OwnPtr m_file; + OwnPtr m_file; Block::Index m_highest_block_written { 0 }; Block::Index m_next_block { 1 }; Block::Index m_schemas_root { 0 }; diff --git a/Userland/Shell/Builtin.cpp b/Userland/Shell/Builtin.cpp index 30fdbcd552c..47f56dbf514 100644 --- a/Userland/Shell/Builtin.cpp +++ b/Userland/Shell/Builtin.cpp @@ -1795,7 +1795,7 @@ ErrorOr Shell::builtin_read(Main::Arguments arguments) split_by_any_of = TRY(const_cast(*split_by_variable).resolve_as_string(*this)); auto file = TRY(Core::File::standard_input()); - auto buffered_stream = TRY(Core::BufferedFile::create(move(file))); + auto buffered_stream = TRY(Core::InputBufferedFile::create(move(file))); StringBuilder builder; ByteBuffer buffer; diff --git a/Userland/Utilities/cmp.cpp b/Userland/Utilities/cmp.cpp index c0b107d4091..28de834dda6 100644 --- a/Userland/Utilities/cmp.cpp +++ b/Userland/Utilities/cmp.cpp @@ -10,10 +10,10 @@ #include #include -static ErrorOr> open_file_or_stdin(StringView filename) +static ErrorOr> open_file_or_stdin(StringView filename) { auto file = TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read)); - return TRY(Core::BufferedFile::create(move(file))); + return TRY(Core::InputBufferedFile::create(move(file))); } ErrorOr serenity_main(Main::Arguments arguments) diff --git a/Userland/Utilities/comm.cpp b/Userland/Utilities/comm.cpp index 31c23f23a80..8ca230a3a58 100644 --- a/Userland/Utilities/comm.cpp +++ b/Userland/Utilities/comm.cpp @@ -73,7 +73,7 @@ ErrorOr serenity_main(Main::Arguments arguments) return false; } - auto buffered_file_or_error = Core::BufferedFile::create(file_or_error.release_value()); + auto buffered_file_or_error = Core::InputBufferedFile::create(file_or_error.release_value()); if (buffered_file_or_error.is_error()) { warnln("Failed to create buffer for file{} '{}': {}", file_number, path, buffered_file_or_error.error()); return false; @@ -83,8 +83,8 @@ ErrorOr serenity_main(Main::Arguments arguments) return true; }; - OwnPtr file1; - OwnPtr file2; + OwnPtr file1; + OwnPtr file2; if (!(open_file(file1_path, file1, 1) && open_file(file2_path, file2, 2))) return 1; diff --git a/Userland/Utilities/grep.cpp b/Userland/Utilities/grep.cpp index e819e234051..e73fddafc5f 100644 --- a/Userland/Utilities/grep.cpp +++ b/Userland/Utilities/grep.cpp @@ -163,7 +163,7 @@ ErrorOr serenity_main(Main::Arguments args) if (!pattern_file.is_empty()) { auto file = TRY(Core::File::open(pattern_file, Core::File::OpenMode::Read)); - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); Array buffer; while (!buffered_file->is_eof()) { auto next_pattern = TRY(buffered_file->read_line(buffer)); @@ -242,7 +242,7 @@ ErrorOr serenity_main(Main::Arguments args) auto handle_file = [&matches, binary_mode, count_lines, quiet_mode, user_specified_multiple_files, &matched_line_count, &did_match_something](StringView filename, bool print_filename) -> ErrorOr { auto file = TRY(Core::File::open(filename, Core::File::OpenMode::Read)); - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); for (size_t line_number = 1; TRY(buffered_file->can_read_line()); ++line_number) { Array buffer; diff --git a/Userland/Utilities/lzcat.cpp b/Userland/Utilities/lzcat.cpp index cc9d6ba9362..320e814f9ea 100644 --- a/Userland/Utilities/lzcat.cpp +++ b/Userland/Utilities/lzcat.cpp @@ -22,7 +22,7 @@ ErrorOr serenity_main(Main::Arguments arguments) args_parser.parse(arguments); auto file = TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read)); - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); auto stream = TRY(Compress::LzmaDecompressor::create_from_container(move(buffered_file))); // Arbitrarily chosen buffer size. diff --git a/Userland/Utilities/mount.cpp b/Userland/Utilities/mount.cpp index e579a795a53..c5bc783531b 100644 --- a/Userland/Utilities/mount.cpp +++ b/Userland/Utilities/mount.cpp @@ -113,7 +113,7 @@ static ErrorOr mount_all() bool all_ok = true; auto process_fstab_entries = [&](StringView path) -> ErrorOr { auto file_unbuffered = TRY(Core::File::open(path, Core::File::OpenMode::Read)); - auto file = TRY(Core::BufferedFile::create(move(file_unbuffered))); + auto file = TRY(Core::InputBufferedFile::create(move(file_unbuffered))); while (TRY(file->can_read_line())) { auto line = TRY(file->read_line(buffer)); diff --git a/Userland/Utilities/sed.cpp b/Userland/Utilities/sed.cpp index e6a4e72d012..9de2e59f623 100644 --- a/Userland/Utilities/sed.cpp +++ b/Userland/Utilities/sed.cpp @@ -613,7 +613,7 @@ enum class CycleDecision { class File { AK_MAKE_NONCOPYABLE(File); - File(LexicalPath input_file_path, NonnullOwnPtr&& file, OwnPtr&& output, OwnPtr&& temp_file) + File(LexicalPath input_file_path, NonnullOwnPtr&& file, OwnPtr&& output, OwnPtr&& temp_file) : m_input_file_path(move(input_file_path)) , m_file(move(file)) , m_output(move(output)) @@ -625,7 +625,7 @@ public: // Used for -i mode. static ErrorOr create_with_output_file(LexicalPath input_path, NonnullOwnPtr&& file) { - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); auto temp_file = TRY(FileSystem::TempFile::create_temp_file()); // Open the file as read-write, since we need to later copy its contents to the original file. auto output_file = TRY(Core::File::open(temp_file->path(), Core::File::OpenMode::ReadWrite | Core::File::OpenMode::Truncate)); @@ -635,7 +635,7 @@ public: // Used for non -i mode. static ErrorOr create(LexicalPath input_path, NonnullOwnPtr&& file) { - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); return File { move(input_path), move(buffered_file), nullptr, nullptr }; } @@ -650,7 +650,7 @@ public: // We hack standard output into `File` to avoid having two versions of `write_pattern_space`. return File { LexicalPath { "/proc/self/fd/1" }, - TRY(Core::BufferedFile::create(TRY(Core::File::standard_input()))), + TRY(Core::InputBufferedFile::create(TRY(Core::File::standard_input()))), TRY(Core::File::standard_output()), nullptr, }; @@ -697,12 +697,11 @@ public: private: LexicalPath m_input_file_path; - NonnullOwnPtr m_file; + NonnullOwnPtr m_file; // Only in use if we're editing in place. OwnPtr m_output; OwnPtr m_output_temp_file; - size_t m_line_number { 0 }; DeprecatedString m_current_line; constexpr static size_t MAX_SUPPORTED_LINE_SIZE = 4096; diff --git a/Userland/Utilities/sort.cpp b/Userland/Utilities/sort.cpp index 6894ba3aae9..25413ef699c 100644 --- a/Userland/Utilities/sort.cpp +++ b/Userland/Utilities/sort.cpp @@ -62,7 +62,7 @@ struct Options { static ErrorOr load_file(Options options, StringView filename, Vector& lines, HashTable& seen) { - auto file = TRY(Core::BufferedFile::create( + auto file = TRY(Core::InputBufferedFile::create( TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read)))); // FIXME: Unlimited line length diff --git a/Userland/Utilities/sql.cpp b/Userland/Utilities/sql.cpp index 64567268c4c..514d21e522c 100644 --- a/Userland/Utilities/sql.cpp +++ b/Userland/Utilities/sql.cpp @@ -151,7 +151,7 @@ private: NonnullRefPtr m_sql_client; SQL::ConnectionID m_connection_id { 0 }; Core::EventLoop& m_loop; - OwnPtr m_input_file { nullptr }; + OwnPtr m_input_file { nullptr }; bool m_quit_when_files_read { false }; Vector m_input_file_chain {}; Array m_buffer {}; @@ -166,7 +166,7 @@ private: return {}; } - auto buffered_file_or_error = Core::BufferedFile::create(file_or_error.release_value()); + auto buffered_file_or_error = Core::InputBufferedFile::create(file_or_error.release_value()); if (buffered_file_or_error.is_error()) { warnln("Input file {} could not be buffered: {}", file_name, buffered_file_or_error.error()); return {}; diff --git a/Userland/Utilities/tar.cpp b/Userland/Utilities/tar.cpp index dcd3a4f4fc1..9388578de5e 100644 --- a/Userland/Utilities/tar.cpp +++ b/Userland/Utilities/tar.cpp @@ -74,7 +74,7 @@ ErrorOr serenity_main(Main::Arguments arguments) if (!directory.is_empty()) TRY(Core::System::chdir(directory)); - NonnullOwnPtr input_stream = TRY(Core::BufferedFile::create(TRY(Core::File::open_file_or_standard_stream(archive_file, Core::File::OpenMode::Read)))); + NonnullOwnPtr input_stream = TRY(Core::InputBufferedFile::create(TRY(Core::File::open_file_or_standard_stream(archive_file, Core::File::OpenMode::Read)))); if (gzip) input_stream = make(move(input_stream)); diff --git a/Userland/Utilities/uniq.cpp b/Userland/Utilities/uniq.cpp index f7609da2caa..e8f5abe82d4 100644 --- a/Userland/Utilities/uniq.cpp +++ b/Userland/Utilities/uniq.cpp @@ -79,7 +79,7 @@ ErrorOr serenity_main(Main::Arguments arguments) return 0; } - auto infile = TRY(Core::BufferedFile::create(TRY(Core::File::open_file_or_standard_stream(inpath, Core::File::OpenMode::Read)))); + auto infile = TRY(Core::InputBufferedFile::create(TRY(Core::File::open_file_or_standard_stream(inpath, Core::File::OpenMode::Read)))); auto outfile = TRY(Core::File::open_file_or_standard_stream(outpath, Core::File::OpenMode::Write)); size_t count = 0; diff --git a/Userland/Utilities/xzcat.cpp b/Userland/Utilities/xzcat.cpp index 19837711e85..4d9cca37b40 100644 --- a/Userland/Utilities/xzcat.cpp +++ b/Userland/Utilities/xzcat.cpp @@ -22,7 +22,7 @@ ErrorOr serenity_main(Main::Arguments arguments) args_parser.parse(arguments); auto file = TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read)); - auto buffered_file = TRY(Core::BufferedFile::create(move(file))); + auto buffered_file = TRY(Core::InputBufferedFile::create(move(file))); auto stream = TRY(Compress::XzDecompressor::create(move(buffered_file))); // Arbitrarily chosen buffer size.