Rename CharacterDevice::has_data_available_for_reading() -> can_read().

abyesilyurt · Jan 15, 2019 · 08bfe51 · 08bfe51
1 parent 10387be
commit 08bfe51
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/Kernel/Console.cpp b/Kernel/Console.cpp
@@ -23,7 +23,7 @@ Console::~Console()
 {
 }
 
-bool Console::has_data_available_for_reading(Process&) const
+bool Console::can_read(Process&) const
 {
  return false;
 }

diff --git a/Kernel/Console.h b/Kernel/Console.h
@@ -18,7 +18,7 @@ class Console final : public CharacterDevice {
  Console();
  virtual ~Console() override;
 
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override { return true; }
  virtual ssize_t read(byte* buffer, size_t size) override;
  virtual ssize_t write(const byte* data, size_t size) override;

diff --git a/Kernel/Keyboard.cpp b/Kernel/Keyboard.cpp
@@ -114,7 +114,7 @@ Keyboard::~Keyboard()
 {
 }
 
-bool Keyboard::has_data_available_for_reading(Process&) const
+bool Keyboard::can_read(Process&) const
 {
  return !m_queue.is_empty();
 }

diff --git a/Kernel/Keyboard.h b/Kernel/Keyboard.h
@@ -39,7 +39,7 @@ class Keyboard final : public IRQHandler, public CharacterDevice {
  // ^CharacterDevice
  virtual ssize_t read(byte* buffer, size_t) override;
  virtual ssize_t write(const byte* buffer, size_t) override;
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override { return true; }
 
  void emit(byte);

diff --git a/Kernel/MasterPTY.cpp b/Kernel/MasterPTY.cpp
@@ -31,7 +31,7 @@ ssize_t MasterPTY::write(const byte* buffer, size_t size)
  return size;
 }
 
-bool MasterPTY::has_data_available_for_reading(Process&) const
+bool MasterPTY::can_read(Process&) const
 {
  return !m_buffer.is_empty();
 }

diff --git a/Kernel/MasterPTY.h b/Kernel/MasterPTY.h
@@ -13,7 +13,7 @@ class MasterPTY final : public CharacterDevice {
 
  virtual ssize_t read(byte*, size_t) override;
  virtual ssize_t write(const byte*, size_t) override;
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override;
  virtual bool is_master_pty() const override { return true; }
 

diff --git a/Kernel/PS2MouseDevice.cpp b/Kernel/PS2MouseDevice.cpp
@@ -116,7 +116,7 @@ byte PS2MouseDevice::mouse_read()
  return IO::in8(0x60);
 }
 
-bool PS2MouseDevice::has_data_available_for_reading(Process&) const
+bool PS2MouseDevice::can_read(Process&) const
 {
  return !m_buffer.is_empty();
 }

diff --git a/Kernel/PS2MouseDevice.h b/Kernel/PS2MouseDevice.h
@@ -12,7 +12,7 @@ class PS2MouseDevice final : public IRQHandler, public CharacterDevice {
  static PS2MouseDevice& the();
 
  // ^CharacterDevice
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual ssize_t read(byte* buffer, size_t) override;
  virtual ssize_t write(const byte* buffer, size_t) override;
  virtual bool can_write(Process&) const override { return true; }

diff --git a/Kernel/TTY.cpp b/Kernel/TTY.cpp
@@ -42,7 +42,7 @@ ssize_t TTY::write(const byte* buffer, size_t size)
  return size;
 }
 
-bool TTY::has_data_available_for_reading(Process&) const
+bool TTY::can_read(Process&) const
 {
  return !m_buffer.is_empty();
 }

diff --git a/Kernel/TTY.h b/Kernel/TTY.h
@@ -12,7 +12,7 @@ class TTY : public CharacterDevice {
 
  virtual ssize_t read(byte*, size_t) override;
  virtual ssize_t write(const byte*, size_t) override;
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override;
  virtual int ioctl(Process&, unsigned request, unsigned arg) override final;
 

diff --git a/VirtualFileSystem/CharacterDevice.h b/VirtualFileSystem/CharacterDevice.h
@@ -12,7 +12,7 @@ class CharacterDevice {
 
  RetainPtr<FileDescriptor> open(int options);
 
- virtual bool has_data_available_for_reading(Process&) const = 0;
+ virtual bool can_read(Process&) const = 0;
  virtual bool can_write(Process&) const = 0;
 
  virtual ssize_t read(byte* buffer, size_t bufferSize) = 0;

diff --git a/VirtualFileSystem/FileDescriptor.cpp b/VirtualFileSystem/FileDescriptor.cpp
@@ -183,7 +183,7 @@ bool FileDescriptor::has_data_available_for_reading(Process& process)
  return m_fifo->can_read();
  }
  if (m_vnode->isCharacterDevice())
- return m_vnode->characterDevice()->has_data_available_for_reading(process);
+ return m_vnode->characterDevice()->can_read(process);
  return true;
 }
 

diff --git a/VirtualFileSystem/FullDevice.cpp b/VirtualFileSystem/FullDevice.cpp
@@ -13,7 +13,7 @@ FullDevice::~FullDevice()
 {
 }
 
-bool FullDevice::has_data_available_for_reading(Process&) const
+bool FullDevice::can_read(Process&) const
 {
  return true;
 }

diff --git a/VirtualFileSystem/FullDevice.h b/VirtualFileSystem/FullDevice.h
@@ -10,7 +10,7 @@ class FullDevice final : public CharacterDevice {
 
  virtual ssize_t read(byte* buffer, size_t bufferSize) override;
  virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override { return true; }
 };
 
diff --git a/VirtualFileSystem/NullDevice.cpp b/VirtualFileSystem/NullDevice.cpp
@@ -12,7 +12,7 @@ NullDevice::~NullDevice()
 {
 }
 
-bool NullDevice::has_data_available_for_reading(Process&) const
+bool NullDevice::can_read(Process&) const
 {
  return true;
 }

diff --git a/VirtualFileSystem/NullDevice.h b/VirtualFileSystem/NullDevice.h
@@ -11,6 +11,6 @@ class NullDevice final : public CharacterDevice {
  virtual ssize_t read(byte* buffer, size_t bufferSize) override;
  virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
  virtual bool can_write(Process&) const override { return true; }
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
 };
 
diff --git a/VirtualFileSystem/RandomDevice.cpp b/VirtualFileSystem/RandomDevice.cpp
@@ -29,7 +29,7 @@ static void mysrand(unsigned seed)
 }
 #endif
 
-bool RandomDevice::has_data_available_for_reading(Process&) const
+bool RandomDevice::can_read(Process&) const
 {
  return true;
 }

diff --git a/VirtualFileSystem/RandomDevice.h b/VirtualFileSystem/RandomDevice.h
@@ -10,7 +10,7 @@ class RandomDevice final : public CharacterDevice {
 
  virtual ssize_t read(byte* buffer, size_t bufferSize) override;
  virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override { return true; }
 };
 
diff --git a/VirtualFileSystem/ZeroDevice.cpp b/VirtualFileSystem/ZeroDevice.cpp
@@ -12,7 +12,7 @@ ZeroDevice::~ZeroDevice()
 {
 }
 
-bool ZeroDevice::has_data_available_for_reading(Process&) const
+bool ZeroDevice::can_read(Process&) const
 {
  return true;
 }

diff --git a/VirtualFileSystem/ZeroDevice.h b/VirtualFileSystem/ZeroDevice.h
@@ -10,7 +10,7 @@ class ZeroDevice final : public CharacterDevice {
 
  virtual ssize_t read(byte* buffer, size_t bufferSize) override;
  virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override { return true; }
 };
 
diff --git a/Widgets/EventLoop.cpp b/Widgets/EventLoop.cpp
@@ -76,15 +76,15 @@ void EventLoop::waitForEvent()
  bool prev_right_button = screen.right_mouse_button_pressed();
  int dx = 0;
  int dy = 0;
- while (mouse.has_data_available_for_reading(*m_server_process)) {
+ while (mouse.can_read(*m_server_process)) {
  signed_byte data[3];
  ssize_t nread = mouse.read((byte*)data, 3);
  ASSERT(nread == 3);
  bool left_button = data[0] & 1;
  bool right_button = data[0] & 2;
  dx += data[1];
  dy += -data[2];
- if (left_button != prev_left_button || right_button != prev_right_button || !mouse.has_data_available_for_reading(*m_server_process)) {
+ if (left_button != prev_left_button || right_button != prev_right_button || !mouse.can_read(*m_server_process)) {
  prev_left_button = left_button;
  prev_right_button = right_button;
  screen.on_receive_mouse_data(dx, dy, left_button, right_button);

diff --git a/Widgets/GUIEventDevice.cpp b/Widgets/GUIEventDevice.cpp
@@ -14,7 +14,7 @@ GUIEventDevice::~GUIEventDevice()
 {
 }
 
-bool GUIEventDevice::has_data_available_for_reading(Process& process) const
+bool GUIEventDevice::can_read(Process& process) const
 {
  return !process.gui_events().is_empty();
 }

diff --git a/Widgets/GUIEventDevice.h b/Widgets/GUIEventDevice.h
@@ -11,6 +11,6 @@ class GUIEventDevice final : public CharacterDevice {
  // ^CharacterDevice
  virtual ssize_t read(byte* buffer, size_t bufferSize) override;
  virtual ssize_t write(const byte* buffer, size_t bufferSize) override;
- virtual bool has_data_available_for_reading(Process&) const override;
+ virtual bool can_read(Process&) const override;
  virtual bool can_write(Process&) const override { return true; }
 };