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

Kernel: Tidy up AnonymousFile construction a bit

Browse source 
- Rename create() => try_create()
- Use adopt_nonnull_ref_or_enomem()
This commit is contained in:
Andreas Kling 2021-09-05 14:33:25 +02:00
parent 9a1fdb523f
commit 4012099338
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/FileSystem/AnonymousFile.h
View file

@ -13,9 +13,9 @@ namespace Kernel {
class AnonymousFile final : public File { class AnonymousFile final : public File {
public: public:
static RefPtr<AnonymousFile> create(NonnullRefPtr<Memory::AnonymousVMObject> vmobject) static KResultOr<NonnullRefPtr<AnonymousFile>> try_create(NonnullRefPtr<Memory::AnonymousVMObject> vmobject)
{ {
return adopt_ref_if_nonnull(new (nothrow) AnonymousFile(move(vmobject))); return adopt_nonnull_ref_or_enomem(new (nothrow) AnonymousFile(move(vmobject)));
} }
virtual ~AnonymousFile() override; virtual ~AnonymousFile() override;

8
Kernel/Syscalls/anon_create.cpp
View file

@ -33,10 +33,10 @@ KResultOr<FlatPtr> Process::sys$anon_create(size_t size, int options)
if (maybe_vmobject.is_error()) if (maybe_vmobject.is_error())
return maybe_vmobject.error(); return maybe_vmobject.error();
auto anon_file = AnonymousFile::create(maybe_vmobject.release_value()); auto anon_file_or_error = AnonymousFile::try_create(maybe_vmobject.release_value());
if (!anon_file) if (anon_file_or_error.is_error())
return ENOMEM; return anon_file_or_error.error();
auto description_or_error = FileDescription::try_create(*anon_file); auto description_or_error = FileDescription::try_create(anon_file_or_error.release_value());
if (description_or_error.is_error()) if (description_or_error.is_error())
return description_or_error.error(); return description_or_error.error();