hjert-code: Fix some code quality issues.

skift-org · Mar 2, 2024 · d20d513 · d20d513
1 parent 2409352
commit d20d513
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;