mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-24 18:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibCore+LibIPC: Remove badge on File::leak_fd

Browse source 
This removes a dependency on LibIPC from LibCore.
This commit is contained in:
rmg-x 2025-06-13 18:19:04 -05:00 • committed by Tim Flynn
parent d06809dee6
commit 18f28f398b
Notes: github-actions[bot] 2025-06-14 20:04:46 +00:00
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibCore/File.h
View file

@ -7,13 +7,11 @@
#pragma once #pragma once
#include <AK/Badge.h>
#include <AK/BufferedStream.h> #include <AK/BufferedStream.h>
#include <AK/Noncopyable.h> #include <AK/Noncopyable.h>
#include <AK/NonnullOwnPtr.h> #include <AK/NonnullOwnPtr.h>
#include <AK/Stream.h> #include <AK/Stream.h>
#include <LibCore/Forward.h> #include <LibCore/Forward.h>
#include <LibIPC/Forward.h>
namespace Core { namespace Core {
@ -77,8 +75,7 @@ public:
// See also Socket::set_blocking. // See also Socket::set_blocking.
ErrorOr<void> set_blocking(bool enabled); ErrorOr<void> set_blocking(bool enabled);
template<OneOf<::IPC::File, ::Core::MappedFile> VIP> int leak_fd()
int leak_fd(Badge<VIP>)
{ {
m_should_close_file_descriptor = ShouldCloseFileDescriptor::No; m_should_close_file_descriptor = ShouldCloseFileDescriptor::No;
return m_fd; return m_fd;

2
Libraries/LibCore/MappedFile.cpp
View file

@ -22,7 +22,7 @@ ErrorOr<NonnullOwnPtr<MappedFile>> MappedFile::map(StringView path, Mode mode)
ErrorOr<NonnullOwnPtr<MappedFile>> MappedFile::map_from_file(NonnullOwnPtr<Core::File> stream, StringView path) ErrorOr<NonnullOwnPtr<MappedFile>> MappedFile::map_from_file(NonnullOwnPtr<Core::File> stream, StringView path)
{ {
return map_from_fd_and_close(stream->leak_fd(Badge<MappedFile> {}), path); return map_from_fd_and_close(stream->leak_fd(), path);
} }
ErrorOr<NonnullOwnPtr<MappedFile>> MappedFile::map_from_fd_and_close(int fd, [[maybe_unused]] StringView path, Mode mode) ErrorOr<NonnullOwnPtr<MappedFile>> MappedFile::map_from_fd_and_close(int fd, [[maybe_unused]] StringView path, Mode mode)

2
Libraries/LibIPC/File.h
View file

@ -22,7 +22,7 @@ public:
static File adopt_file(NonnullOwnPtr<Core::File> file) static File adopt_file(NonnullOwnPtr<Core::File> file)
{ {
return File(file->leak_fd(Badge<File> {})); return File(file->leak_fd());
} }
static File adopt_fd(int fd) static File adopt_fd(int fd)