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

Kernel: Rename FileDescription => OpenFileDescription

Browse source 
Dr. POSIX really calls these "open file description", not just
"file description", so let's call them exactly that. :^)
This commit is contained in:
Andreas Kling 2021-09-07 13:39:11 +02:00
parent dbd639a2d8
commit 4a9c18afb9
135 changed files with 680 additions and 680 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/TTY/MasterPTY.cpp
View file

@ -62,14 +62,14 @@ String MasterPTY::pts_name() const
return m_pts_name;
}
KResultOr<size_t> MasterPTY::read(FileDescription&, u64, UserOrKernelBuffer& buffer, size_t size)
KResultOr<size_t> MasterPTY::read(OpenFileDescription&, u64, UserOrKernelBuffer& buffer, size_t size)
{
if (!m_slave && m_buffer->is_empty())
return 0;
return m_buffer->read(buffer, size);
}
KResultOr<size_t> MasterPTY::write(FileDescription&, u64, const UserOrKernelBuffer& buffer, size_t size)
KResultOr<size_t> MasterPTY::write(OpenFileDescription&, u64, const UserOrKernelBuffer& buffer, size_t size)
{
if (!m_slave)
return EIO;
@ -77,14 +77,14 @@ KResultOr<size_t> MasterPTY::write(FileDescription&, u64, const UserOrKernelBuff
return size;
}
bool MasterPTY::can_read(const FileDescription&, size_t) const
bool MasterPTY::can_read(const OpenFileDescription&, size_t) const
{
if (!m_slave)
return true;
return !m_buffer->is_empty();
}
bool MasterPTY::can_write(const FileDescription&, size_t) const
bool MasterPTY::can_write(const OpenFileDescription&, size_t) const
{
return true;
}
@ -93,7 +93,7 @@ void MasterPTY::notify_slave_closed(Badge<SlavePTY>)
{
dbgln_if(MASTERPTY_DEBUG, "MasterPTY({}): slave closed, my retains: {}, slave retains: {}", m_index, ref_count(), m_slave->ref_count());
// +1 ref for my MasterPTY::m_slave
// +1 ref for FileDescription::m_device
// +1 ref for OpenFileDescription::m_device
if (m_slave->ref_count() == 2)
m_slave = nullptr;
}
@ -115,7 +115,7 @@ bool MasterPTY::can_write_from_slave() const
KResult MasterPTY::close()
{
InterruptDisabler disabler;
// After the closing FileDescription dies, slave is the only thing keeping me alive.
// After the closing OpenFileDescription dies, slave is the only thing keeping me alive.
// From this point, let's consider ourselves closed.
m_closed = true;
@ -125,7 +125,7 @@ KResult MasterPTY::close()
return KSuccess;
}
KResult MasterPTY::ioctl(FileDescription& description, unsigned request, Userspace<void*> arg)
KResult MasterPTY::ioctl(OpenFileDescription& description, unsigned request, Userspace<void*> arg)
{
REQUIRE_PROMISE(tty);
if (!m_slave)
@ -135,7 +135,7 @@ KResult MasterPTY::ioctl(FileDescription& description, unsigned request, Userspa
return EINVAL;
}
String MasterPTY::absolute_path(const FileDescription&) const
String MasterPTY::absolute_path(const OpenFileDescription&) const
{
return String::formatted("ptm:{}", m_pts_name);
}