From c8bfb07b4146ba5c560866a0c1ea6236ea1d37eb Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Tue, 13 Sep 2022 12:24:37 +0100 Subject: [PATCH] Applets/Network: Port to Core::Stream --- Userland/Applets/Network/main.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Userland/Applets/Network/main.cpp b/Userland/Applets/Network/main.cpp index cf67198a66..f4827196f3 100644 --- a/Userland/Applets/Network/main.cpp +++ b/Userland/Applets/Network/main.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include @@ -109,14 +109,19 @@ private: { StringBuilder adapter_info; - auto file = Core::File::construct("/proc/net/adapters"); - if (!file->open(Core::OpenMode::ReadOnly)) { - dbgln("Error: Could not open {}: {}", file->name(), file->error_string()); - return adapter_info.to_string(); + auto file_or_error = Core::Stream::File::open("/proc/net/adapters"sv, Core::Stream::OpenMode::Read); + if (file_or_error.is_error()) { + dbgln("Error: Could not open /proc/net/adapters: {}", file_or_error.error()); + return ""; } - auto file_contents = file->read_all(); - auto json = JsonValue::from_string(file_contents); + auto file_contents_or_error = file_or_error.value()->read_all(); + if (file_contents_or_error.is_error()) { + dbgln("Error: Could not read /proc/net/adapters: {}", file_contents_or_error.error()); + return ""; + } + + auto json = JsonValue::from_string(file_contents_or_error.value()); if (json.is_error()) return adapter_info.to_string();