From 83a59396c828dbcec9bc1ad565ce76ae88b3d47a Mon Sep 17 00:00:00 2001 From: MacDue Date: Sun, 5 Feb 2023 16:13:29 +0000 Subject: [PATCH] Kernel: Fix CPUInfo error propagation fixme We can now propagate the errors directly from for_each_split_view(), which I think counts as "Make this nicer" :^) --- Kernel/FileSystem/SysFS/Subsystems/Kernel/CPUInfo.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/CPUInfo.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/CPUInfo.cpp index 84c00262565..942ee51b495 100644 --- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/CPUInfo.cpp +++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/CPUInfo.cpp @@ -40,13 +40,9 @@ ErrorOr SysFSCPUInformation::try_generate(KBufferBuilder& builder) auto features_array = TRY(obj.add_array("features"sv)); auto keep_empty = SplitBehavior::KeepEmpty; - ErrorOr result; // FIXME: Make this nicer - info.features_string().for_each_split_view(' ', keep_empty, [&](StringView feature) { - if (result.is_error()) - return; - result = features_array.add(feature); - }); - TRY(result); + TRY(info.features_string().for_each_split_view(' ', keep_empty, [&](StringView feature) { + return features_array.add(feature); + })); TRY(features_array.finish());