RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 16:18:12 +00:00
Code Issues Activity Actions

Kernel: Make file description lookup return KResultOr

Browse source 
Instead of checking it at every call site (to generate EBADF), we make
file_description(fd) return a KResultOr<NonnullRefPtr<FileDescription>>.

This allows us to wrap all the calls in TRY(). :^)

The only place that got a little bit messier from this is sys$mount(),
and there's a whole bunch of things there in need of cleanup.
This commit is contained in:
Andreas Kling 2021-09-05 18:34:28 +02:00
parent 2d2ea05c97
commit a9204510a4
24 changed files with 62 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Syscalls/write.cpp
View file

@ -33,10 +33,7 @@ KResultOr<FlatPtr> Process::sys$writev(int fd, Userspace<const struct iovec*> io
return EINVAL;
}
auto description = fds().file_description(fd);
if (!description)
return EBADF;
auto description = TRY(fds().file_description(fd));
if (!description->is_writable())
return EBADF;
@ -104,9 +101,7 @@ KResultOr<FlatPtr> Process::sys$write(int fd, Userspace<const u8*> data, size_t
return EINVAL;
dbgln_if(IO_DEBUG, "sys$write({}, {}, {})", fd, data.ptr(), size);
auto description = fds().file_description(fd);
if (!description)
return EBADF;
auto description = TRY(fds().file_description(fd));
if (!description->is_writable())
return EBADF;