RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-29 17:25:10 +00:00
Code Issues Activity Actions

LibKeyboard: Use ErrorOr<T> for CharacterMap::fetch_system_map()

Browse source
This commit is contained in:
Andreas Kling 2021-11-07 11:25:25 +01:00
parent e76b21a66f
commit c6cc0a88a1
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibKeyboard/CharacterMap.cpp
View file

@ -40,14 +40,13 @@ int CharacterMap::set_system_map()
return setkeymap(m_character_map_name.characters(), m_character_map_data.map, m_character_map_data.shift_map, m_character_map_data.alt_map, m_character_map_data.altgr_map, m_character_map_data.shift_altgr_map);
}
Result<CharacterMap, OSError> CharacterMap::fetch_system_map()
ErrorOr<CharacterMap> CharacterMap::fetch_system_map()
{
CharacterMapData map_data;
char keymap_name[50 + 1] = { 0 };
if (getkeymap(keymap_name, sizeof(keymap_name), map_data.map, map_data.shift_map, map_data.alt_map, map_data.altgr_map, map_data.shift_altgr_map) < 0) {
return OSError(errno);
}
if (getkeymap(keymap_name, sizeof(keymap_name), map_data.map, map_data.shift_map, map_data.alt_map, map_data.altgr_map, map_data.shift_altgr_map) < 0)
return Error::from_errno(errno);
return CharacterMap { keymap_name, map_data };
}