From 8110cf9fab208afa9b83e19c67a296d9bd9a2ed6 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 2 Mar 2023 17:47:27 +0000 Subject: [PATCH] PartitionEditor: Migrate to Directory::for_each_entry() --- Userland/Applications/PartitionEditor/main.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Userland/Applications/PartitionEditor/main.cpp b/Userland/Applications/PartitionEditor/main.cpp index 9c05c24ccb..70cd61dd69 100644 --- a/Userland/Applications/PartitionEditor/main.cpp +++ b/Userland/Applications/PartitionEditor/main.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -20,12 +20,13 @@ static Vector get_device_paths() { auto device_paths = Vector(); - Core::DirIterator iterator("/dev", Core::DirIterator::SkipParentAndBaseDir); - while (iterator.has_next()) { - auto path = iterator.next_full_path(); - if (Core::DeprecatedFile::is_block_device(path)) - device_paths.append(path); - } + // FIXME: Propagate errors. + (void)Core::Directory::for_each_entry("/dev"sv, Core::DirIterator::Flags::SkipParentAndBaseDir, [&](auto const& entry, auto const& directory) -> ErrorOr { + auto full_path = LexicalPath::join(directory.path().string(), entry.name).string(); + if (Core::DeprecatedFile::is_block_device(full_path)) + device_paths.append(full_path); + return IterationDecision::Continue; + }); return device_paths; }