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

Kernel/Ext2FS: Wrap calls to traverse_as_directory() in TRY()

Browse source 
Nothing says we can't TRY() a multi-line function call. :^)
This commit is contained in:
Andreas Kling 2021-09-06 11:27:24 +02:00
parent 18dbafec85
commit b083b165a7
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -1175,17 +1175,14 @@ KResult Ext2FSInode::add_child(Inode& child, const StringView& name, mode_t mode
Vector<Ext2FSDirectoryEntry> entries; Vector<Ext2FSDirectoryEntry> entries;
bool name_already_exists = false; bool name_already_exists = false;
KResult result = traverse_as_directory([&](auto& entry) { TRY(traverse_as_directory([&](auto& entry) {
if (name == entry.name) { if (name == entry.name) {
name_already_exists = true; name_already_exists = true;
return false; return false;
} }
entries.append({ entry.name, entry.inode.index(), entry.file_type }); entries.append({ entry.name, entry.inode.index(), entry.file_type });
return true; return true;
}); }));
if (result.is_error())
return result;
if (name_already_exists) { if (name_already_exists) {
dbgln("Ext2FSInode[{}]::add_child(): Name '{}' already exists", identifier(), name); dbgln("Ext2FSInode[{}]::add_child(): Name '{}' already exists", identifier(), name);
@ -1220,13 +1217,11 @@ KResult Ext2FSInode::remove_child(const StringView& name)
InodeIdentifier child_id { fsid(), child_inode_index }; InodeIdentifier child_id { fsid(), child_inode_index };
Vector<Ext2FSDirectoryEntry> entries; Vector<Ext2FSDirectoryEntry> entries;
KResult result = traverse_as_directory([&](auto& entry) { TRY(traverse_as_directory([&](auto& entry) {
if (name != entry.name) if (name != entry.name)
entries.append({ entry.name, entry.inode.index(), entry.file_type }); entries.append({ entry.name, entry.inode.index(), entry.file_type });
return true; return true;
}); }));
if (result.is_error())
return result;
TRY(write_directory(entries)); TRY(write_directory(entries));
@ -1569,13 +1564,10 @@ KResult Ext2FSInode::populate_lookup_cache() const
return KSuccess; return KSuccess;
HashMap<String, InodeIndex> children; HashMap<String, InodeIndex> children;
KResult result = traverse_as_directory([&children](auto& entry) { TRY(traverse_as_directory([&children](auto& entry) {
children.set(entry.name, entry.inode.index()); children.set(entry.name, entry.inode.index());
return true; return true;
}); }));
if (!result.is_success())
return result;
VERIFY(m_lookup_cache.is_empty()); VERIFY(m_lookup_cache.is_empty());
m_lookup_cache = move(children); m_lookup_cache = move(children);