mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 04:17:35 +00:00
Kernel: Make all syscall functions return KResultOr<T>
This makes it a lot easier to return errors since we no longer have to worry about negating EFOO errors and can just return them flat.
This commit is contained in:
parent
9af1e1a3bf
commit
ac71775de5
70 changed files with 747 additions and 742 deletions
|
@ -31,68 +31,68 @@ namespace Kernel {
|
|||
|
||||
constexpr size_t map_name_max_size = 50;
|
||||
|
||||
int Process::sys$setkeymap(Userspace<const Syscall::SC_setkeymap_params*> user_params)
|
||||
KResultOr<int> Process::sys$setkeymap(Userspace<const Syscall::SC_setkeymap_params*> user_params)
|
||||
{
|
||||
REQUIRE_PROMISE(setkeymap);
|
||||
|
||||
if (!is_superuser())
|
||||
return -EPERM;
|
||||
return EPERM;
|
||||
|
||||
Syscall::SC_setkeymap_params params;
|
||||
if (!copy_from_user(¶ms, user_params))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
|
||||
Keyboard::CharacterMapData character_map_data;
|
||||
|
||||
if (!copy_n_from_user(character_map_data.map, params.map, CHAR_MAP_SIZE))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_n_from_user(character_map_data.shift_map, params.shift_map, CHAR_MAP_SIZE))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_n_from_user(character_map_data.alt_map, params.alt_map, CHAR_MAP_SIZE))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_n_from_user(character_map_data.altgr_map, params.altgr_map, CHAR_MAP_SIZE))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_n_from_user(character_map_data.shift_altgr_map, params.shift_altgr_map, CHAR_MAP_SIZE))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
|
||||
auto map_name = get_syscall_path_argument(params.map_name);
|
||||
if (map_name.is_error()) {
|
||||
return map_name.error();
|
||||
}
|
||||
if (map_name.value().length() > map_name_max_size) {
|
||||
return -ENAMETOOLONG;
|
||||
return ENAMETOOLONG;
|
||||
}
|
||||
|
||||
KeyboardDevice::the().set_maps(character_map_data, map_name.value());
|
||||
return 0;
|
||||
}
|
||||
|
||||
int Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_params*> user_params)
|
||||
KResultOr<int> Process::sys$getkeymap(Userspace<const Syscall::SC_getkeymap_params*> user_params)
|
||||
{
|
||||
REQUIRE_PROMISE(getkeymap);
|
||||
|
||||
Syscall::SC_getkeymap_params params;
|
||||
if (!copy_from_user(¶ms, user_params))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
|
||||
String keymap_name = KeyboardDevice::the().keymap_name();
|
||||
const Keyboard::CharacterMapData& character_maps = KeyboardDevice::the().character_maps();
|
||||
|
||||
if (!copy_to_user(params.map, character_maps.map, CHAR_MAP_SIZE * sizeof(u32)))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_to_user(params.shift_map, character_maps.shift_map, CHAR_MAP_SIZE * sizeof(u32)))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_to_user(params.alt_map, character_maps.alt_map, CHAR_MAP_SIZE * sizeof(u32)))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_to_user(params.altgr_map, character_maps.altgr_map, CHAR_MAP_SIZE * sizeof(u32)))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
if (!copy_to_user(params.shift_altgr_map, character_maps.shift_altgr_map, CHAR_MAP_SIZE * sizeof(u32)))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
|
||||
if (params.map_name.size < keymap_name.length())
|
||||
return -ENAMETOOLONG;
|
||||
return ENAMETOOLONG;
|
||||
if (!copy_to_user(params.map_name.data, keymap_name.characters(), keymap_name.length()))
|
||||
return -EFAULT;
|
||||
return EFAULT;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue