RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:07:44 +00:00
Code Issues Activity Actions

DHCPClient: Replace Result<T, E> use with ErrorOr<T>

Browse source
This commit is contained in:
Andreas Kling 2021-11-07 11:38:01 +01:00
parent d1477bcb8e
commit fbbb87d517
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Services/DHCPClient/DHCPv4Client.cpp
View file

@ -10,6 +10,7 @@
#include <AK/JsonObject.h> #include <AK/JsonObject.h>
#include <AK/JsonParser.h> #include <AK/JsonParser.h>
#include <AK/Random.h> #include <AK/Random.h>
#include <AK/Try.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
#include <stdio.h> #include <stdio.h>
@ -161,20 +162,16 @@ void DHCPv4Client::try_discover_ifs()
} }
} }
Result<DHCPv4Client::Interfaces, String> DHCPv4Client::get_discoverable_interfaces() ErrorOr<DHCPv4Client::Interfaces> DHCPv4Client::get_discoverable_interfaces()
{ {
auto file = Core::File::construct("/proc/net/adapters"); auto file = TRY(Core::File::open("/proc/net/adapters", Core::OpenMode::ReadOnly));
if (!file->open(Core::OpenMode::ReadOnly)) {
dbgln("Error: Failed to open /proc/net/adapters: {}", file->error_string());
return String { file->error_string() };
}
auto file_contents = file->read_all(); auto file_contents = file->read_all();
auto json = JsonValue::from_string(file_contents); auto json = JsonValue::from_string(file_contents);
if (!json.has_value() || !json.value().is_array()) { if (!json.has_value() || !json.value().is_array()) {
dbgln("Error: No network adapters available"); dbgln("Error: No network adapters available");
return String { "No network adapters available" }; return Error::from_string_literal("No network adapters available"sv);
} }
Vector<InterfaceDescriptor> ifnames_to_immediately_discover, ifnames_to_attempt_later; Vector<InterfaceDescriptor> ifnames_to_immediately_discover, ifnames_to_attempt_later;

4
Userland/Services/DHCPClient/DHCPv4Client.h
View file

@ -7,9 +7,9 @@
#pragma once #pragma once
#include "DHCPv4.h" #include "DHCPv4.h"
#include <AK/Error.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/OwnPtr.h> #include <AK/OwnPtr.h>
#include <AK/Result.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCore/UDPServer.h> #include <LibCore/UDPServer.h>
@ -53,7 +53,7 @@ public:
Vector<InterfaceDescriptor> ready; Vector<InterfaceDescriptor> ready;
Vector<InterfaceDescriptor> not_ready; Vector<InterfaceDescriptor> not_ready;
}; };
static Result<Interfaces, String> get_discoverable_interfaces(); static ErrorOr<Interfaces> get_discoverable_interfaces();
private: private:
explicit DHCPv4Client(); explicit DHCPv4Client();