RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:27:46 +00:00
Code Issues Activity Actions

LibCore: Move Stream-based file into the Core namespace

Browse source
This commit is contained in:
Tim Schumacher 2023-02-09 03:02:46 +01:00 • committed by Linus Groh
parent a96339b72b
commit 606a3982f3
218 changed files with 748 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Utilities/comm.cpp
View file

@ -7,6 +7,7 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/File.h>
#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
@ -62,7 +63,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
auto open_file = [](DeprecatedString const& path, auto& file, int file_number) {
auto file_or_error = Core::Stream::File::open_file_or_standard_stream(path, Core::Stream::OpenMode::Read);
auto file_or_error = Core::File::open_file_or_standard_stream(path, Core::File::OpenMode::Read);
if (file_or_error.is_error()) {
warnln("Failed to open file{} '{}': {}", file_number, path, file_or_error.error());
return false;
@ -73,7 +74,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return false;
}
auto buffered_file_or_error = Core::Stream::BufferedFile::create(file_or_error.release_value());
auto buffered_file_or_error = Core::BufferedFile::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 +84,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return true;
};
OwnPtr<Core::Stream::BufferedFile> file1;
OwnPtr<Core::Stream::BufferedFile> file2;
OwnPtr<Core::BufferedFile> file1;
OwnPtr<Core::BufferedFile> file2;
if (!(open_file(file1_path, file1, 1) && open_file(file2_path, file2, 2)))
return 1;