RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 08:07:45 +00:00
Code Issues Activity Actions

Kernel: Rename LocalSocket::create_connected_pair() => try_*()

Browse source
This commit is contained in:
Andreas Kling 2021-08-29 01:31:45 +02:00
parent 7f96288535
commit 48a1a3c0ce
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Net/LocalSocket.cpp
View file

@ -48,7 +48,7 @@ KResultOr<NonnullRefPtr<LocalSocket>> LocalSocket::try_create(int type)
return ENOMEM; return ENOMEM;
} }
KResultOr<SocketPair> LocalSocket::create_connected_pair(int type) KResultOr<SocketPair> LocalSocket::try_create_connected_pair(int type)
{ {
auto socket_or_error = LocalSocket::try_create(type); auto socket_or_error = LocalSocket::try_create(type);
if (socket_or_error.is_error()) if (socket_or_error.is_error())

2
Kernel/Net/LocalSocket.h
View file

@ -23,7 +23,7 @@ class LocalSocket final : public Socket {
public: public:
static KResultOr<NonnullRefPtr<LocalSocket>> try_create(int type); static KResultOr<NonnullRefPtr<LocalSocket>> try_create(int type);
static KResultOr<SocketPair> create_connected_pair(int type); static KResultOr<SocketPair> try_create_connected_pair(int type);
virtual ~LocalSocket() override; virtual ~LocalSocket() override;
KResult sendfd(const FileDescription& socket_description, FileDescription& passing_description); KResult sendfd(const FileDescription& socket_description, FileDescription& passing_description);

2
Kernel/Syscalls/socket.cpp
View file

@ -406,7 +406,7 @@ KResultOr<FlatPtr> Process::sys$socketpair(Userspace<const Syscall::SC_socketpai
if (params.protocol != 0 && params.protocol != PF_LOCAL) if (params.protocol != 0 && params.protocol != PF_LOCAL)
return EINVAL; return EINVAL;
auto result = LocalSocket::create_connected_pair(params.type & SOCK_TYPE_MASK); auto result = LocalSocket::try_create_connected_pair(params.type & SOCK_TYPE_MASK);
if (result.is_error()) if (result.is_error())
return result.error(); return result.error();
auto pair = result.value(); auto pair = result.value();