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

Kernel: Make File's can_read/can_write take a const FileDescription&

Browse source 
Asking a File if we could possibly read or write it will never mutate
the asking FileDescription&, so it should be const.
This commit is contained in:
Andreas Kling 2019-11-04 14:03:14 +01:00
parent e8fee92357
commit 1b2ef8582c
47 changed files with 97 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/TTY/MasterPTY.cpp
View file

@ -46,14 +46,14 @@ ssize_t MasterPTY::write(FileDescription&, const u8* buffer, ssize_t size)
return size;
}
bool MasterPTY::can_read(FileDescription&) const
bool MasterPTY::can_read(const FileDescription&) const
{
if (!m_slave)
return true;
return !m_buffer.is_empty();
}
bool MasterPTY::can_write(FileDescription&) const
bool MasterPTY::can_write(const FileDescription&) const
{
return true;
}

4
Kernel/TTY/MasterPTY.h
View file

@ -24,8 +24,8 @@ private:
// ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(FileDescription&) const override;
virtual bool can_write(FileDescription&) const override;
virtual bool can_read(const FileDescription&) const override;
virtual bool can_write(const FileDescription&) const override;
virtual void close() override;
virtual bool is_master_pty() const override { return true; }
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override;

4
Kernel/TTY/PTYMultiplexer.h
View file

@ -18,8 +18,8 @@ public:
virtual KResultOr<NonnullRefPtr<FileDescription>> open(int options) override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return 0; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override { return 0; }
virtual bool can_read(FileDescription&) const override { return true; }
virtual bool can_write(FileDescription&) const override { return true; }
virtual bool can_read(const FileDescription&) const override { return true; }
virtual bool can_write(const FileDescription&) const override { return true; }
void notify_master_destroyed(Badge<MasterPTY>, unsigned index);

4
Kernel/TTY/SlavePTY.cpp
View file

@ -48,12 +48,12 @@ ssize_t SlavePTY::on_tty_write(const u8* data, ssize_t size)
return m_master->on_slave_write(data, size);
}
bool SlavePTY::can_write(FileDescription&) const
bool SlavePTY::can_write(const FileDescription&) const
{
return m_master->can_write_from_slave();
}
bool SlavePTY::can_read(FileDescription& description) const
bool SlavePTY::can_read(const FileDescription& description) const
{
if (m_master->is_closed())
return true;

4
Kernel/TTY/SlavePTY.h
View file

@ -19,9 +19,9 @@ private:
virtual void echo(u8) override;
// ^CharacterDevice
virtual bool can_read(FileDescription&) const override;
virtual bool can_read(const FileDescription&) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual bool can_write(FileDescription&) const override;
virtual bool can_write(const FileDescription&) const override;
virtual const char* class_name() const override { return "SlavePTY"; }
virtual void close() override;

4
Kernel/TTY/TTY.cpp
View file

@ -68,7 +68,7 @@ ssize_t TTY::write(FileDescription&, const u8* buffer, ssize_t size)
return size;
}
bool TTY::can_read(FileDescription&) const
bool TTY::can_read(const FileDescription&) const
{
if (in_canonical_mode()) {
return m_available_lines > 0;
@ -76,7 +76,7 @@ bool TTY::can_read(FileDescription&) const
return !m_input_buffer.is_empty();
}
bool TTY::can_write(FileDescription&) const
bool TTY::can_write(const FileDescription&) const
{
return true;
}

4
Kernel/TTY/TTY.h
View file

@ -13,8 +13,8 @@ public:
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(FileDescription&) const override;
virtual bool can_write(FileDescription&) const override;
virtual bool can_read(const FileDescription&) const override;
virtual bool can_write(const FileDescription&) const override;
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override final;
virtual String absolute_path(const FileDescription&) const override { return tty_name(); }