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

Kernel/Net: Make the LoopbackAdapter initializer to use ErrorOr pattern

Browse source 
This looks much more nice, and also matches our pattern for other types
of network adapters' initializers.
This commit is contained in:
Liav A 2023-04-11 03:44:55 +03:00 • committed by Linus Groh
parent 9f011592be
commit bd7d4513bf
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Net/LoopbackAdapter.cpp
View file

@ -11,12 +11,10 @@ namespace Kernel {
static bool s_loopback_initialized = false; static bool s_loopback_initialized = false;
LockRefPtr<LoopbackAdapter> LoopbackAdapter::try_create() ErrorOr<NonnullRefPtr<LoopbackAdapter>> LoopbackAdapter::try_create()
{ {
auto interface_name = KString::try_create("loop"sv); auto interface_name = TRY(KString::try_create("loop"sv));
if (interface_name.is_error()) return TRY(adopt_nonnull_ref_or_enomem(new (nothrow) LoopbackAdapter(move(interface_name))));
return {};
return adopt_lock_ref_if_nonnull(new LoopbackAdapter(interface_name.release_value()));
} }
LoopbackAdapter::LoopbackAdapter(NonnullOwnPtr<KString> interface_name) LoopbackAdapter::LoopbackAdapter(NonnullOwnPtr<KString> interface_name)

2
Kernel/Net/LoopbackAdapter.h
View file

@ -15,7 +15,7 @@ private:
LoopbackAdapter(NonnullOwnPtr<KString>); LoopbackAdapter(NonnullOwnPtr<KString>);
public: public:
static LockRefPtr<LoopbackAdapter> try_create(); static ErrorOr<NonnullRefPtr<LoopbackAdapter>> try_create();
virtual ~LoopbackAdapter() override; virtual ~LoopbackAdapter() override;
virtual ErrorOr<void> initialize(Badge<NetworkingManagement>) override { VERIFY_NOT_REACHED(); } virtual ErrorOr<void> initialize(Badge<NetworkingManagement>) override { VERIFY_NOT_REACHED(); }

5
Kernel/Net/NetworkingManagement.cpp
View file

@ -136,10 +136,9 @@ bool NetworkingManagement::initialize()
m_adapters.with([&](auto& adapters) { adapters.append(*result.release_value()); }); m_adapters.with([&](auto& adapters) { adapters.append(*result.release_value()); });
})); }));
} }
auto loopback = LoopbackAdapter::try_create(); auto loopback = MUST(LoopbackAdapter::try_create());
VERIFY(loopback);
m_adapters.with([&](auto& adapters) { adapters.append(*loopback); }); m_adapters.with([&](auto& adapters) { adapters.append(*loopback); });
m_loopback_adapter = loopback; m_loopback_adapter = *loopback;
return true; return true;
} }
} }