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

Kernel: Use a FlatPtr for the "argument" to ioctl()

Browse source 
Since it's often used to pass pointers, it should really be a FlatPtr.
This commit is contained in:
Andreas Kling 2020-05-23 13:17:58 +02:00
parent b8af5cd8da
commit b3736c1b1e
14 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/TTY/MasterPTY.cpp
View file

@ -124,7 +124,7 @@ void MasterPTY::close()
}
}
int MasterPTY::ioctl(FileDescription& description, unsigned request, unsigned arg)
int MasterPTY::ioctl(FileDescription& description, unsigned request, FlatPtr arg)
{
REQUIRE_PROMISE(tty);
if (!m_slave)

2
Kernel/TTY/MasterPTY.h
View file

@ -56,7 +56,7 @@ private:
virtual bool can_write(const FileDescription&, size_t) const override;
virtual void close() override;
virtual bool is_master_pty() const override { return true; }
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override;
virtual int ioctl(FileDescription&, unsigned request, FlatPtr arg) override;
virtual const char* class_name() const override { return "MasterPTY"; }
RefPtr<SlavePTY> m_slave;

2
Kernel/TTY/TTY.cpp
View file

@ -279,7 +279,7 @@ void TTY::set_termios(const termios& t)
#endif
}
int TTY::ioctl(FileDescription&, unsigned request, unsigned arg)
int TTY::ioctl(FileDescription&, unsigned request, FlatPtr arg)
{
REQUIRE_PROMISE(tty);
auto& process = *Process::current;

2
Kernel/TTY/TTY.h
View file

@ -43,7 +43,7 @@ public:
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&, size_t) const override;
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override final;
virtual int ioctl(FileDescription&, unsigned request, FlatPtr arg) override final;
virtual String absolute_path(const FileDescription&) const override { return tty_name(); }
virtual StringView tty_name() const = 0;