From 28bfd73b68c28470ab221e42571049bf1eb48ce1 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 25 Jun 2020 10:51:30 +0200 Subject: [PATCH] Kernel: Minor cleanups in sendfd/recvfd Applying some nice suggestions by @bugaevc. :^) --- Kernel/Net/LocalSocket.cpp | 8 ++++---- Kernel/Net/LocalSocket.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp index fee7b67d02..f428a5b7df 100644 --- a/Kernel/Net/LocalSocket.cpp +++ b/Kernel/Net/LocalSocket.cpp @@ -397,7 +397,7 @@ KResult LocalSocket::chown(FileDescription&, uid_t uid, gid_t gid) return KSuccess; } -NonnullRefPtrVector& LocalSocket::recvfd_queue_for(FileDescription& description) +NonnullRefPtrVector& LocalSocket::recvfd_queue_for(const FileDescription& description) { auto role = this->role(description); if (role == Role::Connected) @@ -407,7 +407,7 @@ NonnullRefPtrVector& LocalSocket::recvfd_queue_for(FileDescript ASSERT_NOT_REACHED(); } -NonnullRefPtrVector& LocalSocket::sendfd_queue_for(FileDescription& description) +NonnullRefPtrVector& LocalSocket::sendfd_queue_for(const FileDescription& description) { auto role = this->role(description); if (role == Role::Connected) @@ -417,7 +417,7 @@ NonnullRefPtrVector& LocalSocket::sendfd_queue_for(FileDescript ASSERT_NOT_REACHED(); } -KResult LocalSocket::sendfd(FileDescription& socket_description, NonnullRefPtr passing_description) +KResult LocalSocket::sendfd(const FileDescription& socket_description, FileDescription& passing_description) { LOCKER(lock()); auto role = this->role(socket_description); @@ -431,7 +431,7 @@ KResult LocalSocket::sendfd(FileDescription& socket_description, NonnullRefPtr> LocalSocket::recvfd(FileDescription& socket_description) +KResultOr> LocalSocket::recvfd(const FileDescription& socket_description) { LOCKER(lock()); auto role = this->role(socket_description); diff --git a/Kernel/Net/LocalSocket.h b/Kernel/Net/LocalSocket.h index 0d50b77bdd..e98940dbce 100644 --- a/Kernel/Net/LocalSocket.h +++ b/Kernel/Net/LocalSocket.h @@ -42,8 +42,8 @@ public: static KResultOr> create(int type); virtual ~LocalSocket() override; - KResult sendfd(FileDescription& socket_description, NonnullRefPtr passing_description); - KResultOr> recvfd(FileDescription& socket_description); + KResult sendfd(const FileDescription& socket_description, FileDescription& passing_description); + KResultOr> recvfd(const FileDescription& socket_description); static void for_each(Function); @@ -74,8 +74,8 @@ private: static Lockable>& all_sockets(); DoubleBuffer& receive_buffer_for(FileDescription&); DoubleBuffer& send_buffer_for(FileDescription&); - NonnullRefPtrVector& sendfd_queue_for(FileDescription&); - NonnullRefPtrVector& recvfd_queue_for(FileDescription&); + NonnullRefPtrVector& sendfd_queue_for(const FileDescription&); + NonnullRefPtrVector& recvfd_queue_for(const FileDescription&); // An open socket file on the filesystem. RefPtr m_file;