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

Kernel: Use TRY() in LocalSocket

Browse source
This commit is contained in:
Andreas Kling 2021-09-05 14:01:09 +02:00
parent a5e71debef
commit 81d3f823f7
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/Net/LocalSocket.cpp
View file

@ -50,15 +50,8 @@ KResultOr<NonnullRefPtr<LocalSocket>> LocalSocket::try_create(int type)
KResultOr<SocketPair> LocalSocket::try_create_connected_pair(int type) KResultOr<SocketPair> LocalSocket::try_create_connected_pair(int type)
{ {
auto socket_or_error = LocalSocket::try_create(type); auto socket = TRY(LocalSocket::try_create(type));
if (socket_or_error.is_error()) auto description1 = TRY(FileDescription::try_create(*socket));
return socket_or_error.error();
auto socket = socket_or_error.release_value();
auto description1_result = FileDescription::try_create(*socket);
if (description1_result.is_error())
return description1_result.error();
if (auto result = socket->try_set_path("[socketpair]"sv); result.is_error()) if (auto result = socket->try_set_path("[socketpair]"sv); result.is_error())
return result; return result;
@ -68,11 +61,9 @@ KResultOr<SocketPair> LocalSocket::try_create_connected_pair(int type)
socket->set_connect_side_role(Role::Connected); socket->set_connect_side_role(Role::Connected);
socket->set_role(Role::Accepted); socket->set_role(Role::Accepted);
auto description2_result = FileDescription::try_create(*socket); auto description2 = TRY(FileDescription::try_create(*socket));
if (description2_result.is_error())
return description2_result.error();
return SocketPair { description1_result.release_value(), description2_result.release_value() }; return SocketPair { move(description1), move(description2) };
} }
LocalSocket::LocalSocket(int type, NonnullOwnPtr<DoubleBuffer> client_buffer, NonnullOwnPtr<DoubleBuffer> server_buffer) LocalSocket::LocalSocket(int type, NonnullOwnPtr<DoubleBuffer> client_buffer, NonnullOwnPtr<DoubleBuffer> server_buffer)