From d20d51353ba35c5c5e91d8772fce3b7c47fe86b4 Mon Sep 17 00:00:00 2001
From: VAN BOSSUYT Nicolas <nivb@odoo.com>
Date: Sat, 2 Mar 2024 22:25:41 +0100
Subject: [PATCH] hjert-code: Fix some code quality issues.

---
 src/kernel/hjert-core/channel.cpp  | 3 +--
 src/kernel/hjert-core/listener.cpp | 2 +-
 src/kernel/hjert-core/listener.h   | 2 +-
 src/kernel/hjert-core/syscalls.cpp | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/kernel/hjert-core/channel.cpp b/src/kernel/hjert-core/channel.cpp
index 625a15061b7..8afda136e32 100644
--- a/src/kernel/hjert-core/channel.cpp
+++ b/src/kernel/hjert-core/channel.cpp
@@ -47,8 +47,7 @@ Res<Strong<Channel>> Channel::create(usize cap) {
     return Ok(makeStrong<Channel>(cap));
 }
 
-Channel::Channel(usize cap) {
-    _cap = cap;
+Channel::Channel(usize cap) : _cap(cap) {
 }
 
 Res<> Channel::_ensureNoEmpty() {
diff --git a/src/kernel/hjert-core/listener.cpp b/src/kernel/hjert-core/listener.cpp
index 2c082f9b005..9bdfb16898f 100644
--- a/src/kernel/hjert-core/listener.cpp
+++ b/src/kernel/hjert-core/listener.cpp
@@ -27,7 +27,7 @@ Res<> Listener::listen(Hj::Cap cap, Strong<Object> obj, Flags<Hj::Sigs> set, Fla
     return Ok();
 }
 
-Slice<Hj::Event> Listener::poll() {
+Slice<Hj::Event> Listener::pollEvents() {
     ObjectLockScope scope{*this};
     _events.clear();
 
diff --git a/src/kernel/hjert-core/listener.h b/src/kernel/hjert-core/listener.h
index 58874fb56c5..cb7b8c7dc47 100644
--- a/src/kernel/hjert-core/listener.h
+++ b/src/kernel/hjert-core/listener.h
@@ -24,7 +24,7 @@ struct Listener :
 
     Res<> listen(Hj::Cap cap, Strong<Object> obj, Flags<Hj::Sigs> set, Flags<Hj::Sigs> unset);
 
-    Slice<Hj::Event> poll();
+    Slice<Hj::Event> pollEvents();
 
     Slice<Hj::Event> events() {
         return _events;
diff --git a/src/kernel/hjert-core/syscalls.cpp b/src/kernel/hjert-core/syscalls.cpp
index 2ffb682db39..bb243f87b70 100644
--- a/src/kernel/hjert-core/syscalls.cpp
+++ b/src/kernel/hjert-core/syscalls.cpp
@@ -213,7 +213,7 @@ Res<> doPoll(Task &self, Hj::Cap cap, UserSlice<Hj::Event> events, User<usize> e
     auto obj = try$(self.domain().get<Listener>(cap));
 
     try$(self.block([&] {
-        auto events = obj->poll();
+        auto events = obj->pollEvents();
         if (events.len() > 0)
             return TimeStamp::epoch();
         return deadline;