diff options
| author | Andreas Kling <kling@serenityos.org> | 2021-11-08 00:51:39 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-11-08 01:10:53 +0100 |
| commit | 79fa9765ca89869d19364143989436d117974c21 (patch) | |
| tree | 3af62f70127d9217d841047f6b7461351800d1ae /Kernel/Syscalls/keymap.cpp | |
| parent | 7ee10c69264cb278845a1e1b06d5acf2e5e7ddf0 (diff) | |
| download | serenity-79fa9765ca89869d19364143989436d117974c21.zip | |
Kernel: Replace KResult and KResultOr<T> with Error and ErrorOr<T>
We now use AK::Error and AK::ErrorOr<T> in both kernel and userspace!
This was a slightly tedious refactoring that took a long time, so it's
not unlikely that some bugs crept in.
Nevertheless, it does pass basic functionality testing, and it's just
real nice to finally see the same pattern in all contexts. :^)
Diffstat (limited to 'Kernel/Syscalls/keymap.cpp')
| -rw-r--r-- | Kernel/Syscalls/keymap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Kernel/Syscalls/keymap.cpp b/Kernel/Syscalls/keymap.cpp index 665508456c..c957f4804a 100644 --- a/Kernel/Syscalls/keymap.cpp +++ b/Kernel/Syscalls/keymap.cpp @@ -11,7 +11,7 @@ namespace Kernel { constexpr size_t map_name_max_size = 50; -KResultOr<FlatPtr> Process::sys$setkeymap(Userspace<const Syscall::SC_setkeymap_params*> user_params) +ErrorOr<FlatPtr> Process::sys$setkeymap(Userspace<const Syscall::SC_setkeymap_params*> user_params) { VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this); REQUIRE_PROMISE(setkeymap); @@ -37,7 +37,7 @@ KResultOr<FlatPtr> Process::sys$setkeymap(Userspace<const Syscall::SC_setkeymap_ return 0; } -KResultOr<FlatPtr> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_params*> user_params) +ErrorOr<FlatPtr> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_params*> user_params) { VERIFY_NO_PROCESS_BIG_LOCK(this); REQUIRE_PROMISE(getkeymap); @@ -55,7 +55,7 @@ KResultOr<FlatPtr> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_ if (params.map_name.size < keymap_name.length()) return ENAMETOOLONG; TRY(copy_to_user(params.map_name.data, keymap_name.characters(), keymap_name.length())); - return KSuccess; + return 0; } } |