RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:17:45 +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

4
Userland/Libraries/LibSQL/Heap.cpp
View file

@ -47,8 +47,8 @@ ErrorOr<void> Heap::open()
if (file_size > 0)
m_next_block = m_end_of_file = file_size / BLOCKSIZE;
auto file = TRY(Core::Stream::File::open(name(), Core::Stream::OpenMode::ReadWrite));
m_file = TRY(Core::Stream::BufferedFile::create(move(file)));
auto file = TRY(Core::File::open(name(), Core::File::OpenMode::ReadWrite));
m_file = TRY(Core::BufferedFile::create(move(file)));
if (file_size > 0) {
if (auto error_maybe = read_zero_block(); error_maybe.is_error()) {

3
Userland/Libraries/LibSQL/Heap.h
View file

@ -11,6 +11,7 @@
#include <AK/DeprecatedString.h>
#include <AK/HashMap.h>
#include <AK/Vector.h>
#include <LibCore/File.h>
#include <LibCore/Object.h>
#include <LibCore/Stream.h>
@ -99,7 +100,7 @@ private:
void initialize_zero_block();
void update_zero_block();
OwnPtr<Core::Stream::BufferedFile> m_file;
OwnPtr<Core::BufferedFile> m_file;
u32 m_free_list { 0 };
u32 m_next_block { 1 };
u32 m_end_of_file { 1 };

4
Userland/Libraries/LibSQL/SQLClient.cpp
View file

@ -67,7 +67,7 @@ static ErrorOr<void> launch_server(DeprecatedString const& socket_path, Deprecat
server_pid = TRY(Core::System::fork());
if (server_pid != 0) {
auto server_pid_file = TRY(Core::Stream::File::open(pid_path, Core::Stream::OpenMode::Write));
auto server_pid_file = TRY(Core::File::open(pid_path, Core::File::OpenMode::Write));
TRY(server_pid_file->write(DeprecatedString::number(server_pid).bytes()));
TRY(Core::System::kill(getpid(), SIGTERM));
@ -108,7 +108,7 @@ static ErrorOr<bool> should_launch_server(DeprecatedString const& pid_path)
Optional<pid_t> pid;
{
auto server_pid_file = Core::Stream::File::open(pid_path, Core::Stream::OpenMode::Read);
auto server_pid_file = Core::File::open(pid_path, Core::File::OpenMode::Read);
if (server_pid_file.is_error()) {
warnln("Could not open SQLServer PID file '{}': {}", pid_path, server_pid_file.error());
return server_pid_file.release_error();