diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-06-13 22:03:04 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-06-13 22:03:04 +0200 |
commit | c1bbd40b9e7fa2fbb5051993e729054cb54548ab (patch) | |
tree | 306c75408427e5bade9e41fbb2335c4da48adb3a /Kernel/TTY | |
parent | 1c5677032a948073a91078e57d4d7d4ae4712d36 (diff) | |
download | serenity-c1bbd40b9e7fa2fbb5051993e729054cb54548ab.zip |
Kernel: Rename "descriptor" to "description" where appropriate.
Now that FileDescription is called that, variables of that type should not
be called "descriptor". This is kinda wordy but we'll get used to it.
Diffstat (limited to 'Kernel/TTY')
-rw-r--r-- | Kernel/TTY/MasterPTY.cpp | 4 | ||||
-rw-r--r-- | Kernel/TTY/SlavePTY.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Kernel/TTY/MasterPTY.cpp b/Kernel/TTY/MasterPTY.cpp index b709fe7ebc..b3e64ceda1 100644 --- a/Kernel/TTY/MasterPTY.cpp +++ b/Kernel/TTY/MasterPTY.cpp @@ -96,9 +96,9 @@ void MasterPTY::close() } } -int MasterPTY::ioctl(FileDescription& descriptor, unsigned request, unsigned arg) +int MasterPTY::ioctl(FileDescription& description, unsigned request, unsigned arg) { if (request == TIOCSWINSZ) - return m_slave->ioctl(descriptor, request, arg); + return m_slave->ioctl(description, request, arg); return -EINVAL; } diff --git a/Kernel/TTY/SlavePTY.cpp b/Kernel/TTY/SlavePTY.cpp index 102a7ee48a..2773db17a8 100644 --- a/Kernel/TTY/SlavePTY.cpp +++ b/Kernel/TTY/SlavePTY.cpp @@ -46,18 +46,18 @@ bool SlavePTY::can_write(FileDescription&) const return m_master->can_write_from_slave(); } -bool SlavePTY::can_read(FileDescription& descriptor) const +bool SlavePTY::can_read(FileDescription& description) const { if (m_master->is_closed()) return true; - return TTY::can_read(descriptor); + return TTY::can_read(description); } -ssize_t SlavePTY::read(FileDescription& descriptor, byte* buffer, ssize_t size) +ssize_t SlavePTY::read(FileDescription& description, byte* buffer, ssize_t size) { if (m_master->is_closed()) return 0; - return TTY::read(descriptor, buffer, size); + return TTY::read(description, buffer, size); } void SlavePTY::close() |