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/kill.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/kill.cpp')
| -rw-r--r-- | Kernel/Syscalls/kill.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Kernel/Syscalls/kill.cpp b/Kernel/Syscalls/kill.cpp index 93e1210cb0..1426a88dea 100644 --- a/Kernel/Syscalls/kill.cpp +++ b/Kernel/Syscalls/kill.cpp @@ -96,7 +96,7 @@ KResult Process::do_killself(int signal) return KSuccess; } -KResultOr<int> Process::sys$kill(pid_t pid_or_pgid, int signal) +KResultOr<FlatPtr> Process::sys$kill(pid_t pid_or_pgid, int signal) { if (pid_or_pgid == pid().value()) REQUIRE_PROMISE(stdio); @@ -123,7 +123,7 @@ KResultOr<int> Process::sys$kill(pid_t pid_or_pgid, int signal) return do_kill(*peer, signal); } -KResultOr<int> Process::sys$killpg(pid_t pgrp, int signum) +KResultOr<FlatPtr> Process::sys$killpg(pid_t pgrp, int signum) { REQUIRE_PROMISE(proc); if (signum < 1 || signum >= 32) |