Kernel: Tidy up InodeWatcher construction

- Rename create() => try_create()
- Use adopt_nonnull_ref_or_enomem()
This commit is contained in:
Andreas Kling 2021-09-04 23:52:39 +02:00
parent 393229e2aa
commit 68a6d4c30a
Notes: sideshowbarker 2024-07-18 04:44:30 +09:00
3 changed files with 4 additions and 7 deletions

View File

@ -12,12 +12,9 @@
namespace Kernel {
KResultOr<NonnullRefPtr<InodeWatcher>> InodeWatcher::create()
KResultOr<NonnullRefPtr<InodeWatcher>> InodeWatcher::try_create()
{
auto watcher = adopt_ref_if_nonnull(new (nothrow) InodeWatcher);
if (watcher)
return watcher.release_nonnull();
return ENOMEM;
return adopt_nonnull_ref_or_enomem(new (nothrow) InodeWatcher);
}
InodeWatcher::~InodeWatcher()

View File

@ -43,7 +43,7 @@ private:
class InodeWatcher final : public File {
public:
static KResultOr<NonnullRefPtr<InodeWatcher>> create();
static KResultOr<NonnullRefPtr<InodeWatcher>> try_create();
virtual ~InodeWatcher() override;
virtual bool can_read(const FileDescription&, size_t) const override;

View File

@ -23,7 +23,7 @@ KResultOr<FlatPtr> Process::sys$create_inode_watcher(u32 flags)
return fd_or_error.error();
auto inode_watcher_fd = fd_or_error.release_value();
auto watcher_or_error = InodeWatcher::create();
auto watcher_or_error = InodeWatcher::try_create();
if (watcher_or_error.is_error())
return watcher_or_error.error();