diff options
author | Gunnar Beutner <gbeutner@serenityos.org> | 2021-06-28 20:59:35 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-06-28 22:29:28 +0200 |
commit | 2a78bf85968ebff58b4d23be43fecdbe6178adb2 (patch) | |
tree | 07daafb91a2e20fe77843c7aeb5726469cd29081 /Kernel/Syscalls/write.cpp | |
parent | b6435372cc91a9ce2c3f70a6d12c7f7869dfb2f0 (diff) | |
download | serenity-2a78bf85968ebff58b4d23be43fecdbe6178adb2.zip |
Kernel: Fix the return type for syscalls
The Process::Handler type has KResultOr<FlatPtr> as its return type.
Using a different return type with an equally-sized template parameter
sort of works but breaks once that condition is no longer true, e.g.
for KResultOr<int> on x86_64.
Ideally the syscall handlers would also take FlatPtrs as their args
so we can get rid of the reinterpret_cast for the function pointer
but I didn't quite feel like cleaning that up as well.
Diffstat (limited to 'Kernel/Syscalls/write.cpp')
-rw-r--r-- | Kernel/Syscalls/write.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Kernel/Syscalls/write.cpp b/Kernel/Syscalls/write.cpp index b2585745dc..fece780d9c 100644 --- a/Kernel/Syscalls/write.cpp +++ b/Kernel/Syscalls/write.cpp @@ -11,7 +11,7 @@ namespace Kernel { -KResultOr<size_t> Process::sys$writev(int fd, Userspace<const struct iovec*> iov, int iov_count) +KResultOr<FlatPtr> Process::sys$writev(int fd, Userspace<const struct iovec*> iov, int iov_count) { REQUIRE_PROMISE(stdio); if (iov_count < 0) @@ -57,7 +57,7 @@ KResultOr<size_t> Process::sys$writev(int fd, Userspace<const struct iovec*> iov return nwritten; } -KResultOr<size_t> Process::do_write(FileDescription& description, const UserOrKernelBuffer& data, size_t data_size) +KResultOr<FlatPtr> Process::do_write(FileDescription& description, const UserOrKernelBuffer& data, size_t data_size) { size_t total_nwritten = 0; @@ -96,7 +96,7 @@ KResultOr<size_t> Process::do_write(FileDescription& description, const UserOrKe return total_nwritten; } -KResultOr<size_t> Process::sys$write(int fd, Userspace<const u8*> data, size_t size) +KResultOr<FlatPtr> Process::sys$write(int fd, Userspace<const u8*> data, size_t size) { REQUIRE_PROMISE(stdio); if (size == 0) |