RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:07:47 +00:00
Code Issues Activity Actions

LibKeyboard: Don't assert on failure

Browse source
This commit is contained in:
Ben Wiederhake 2021-01-30 22:41:29 +01:00 • committed by Andreas Kling
parent d9e7e13fb2
commit 0e3408d4d6
4 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,24 +27,22 @@
#include "CharacterMap.h"
#include <AK/StringBuilder.h>
#include <Kernel/API/Syscall.h>
#ifndef KERNEL
# include <LibKeyboard/CharacterMapFile.h>
#endif
#include <LibKeyboard/CharacterMapFile.h>
namespace Keyboard {
CharacterMap::CharacterMap(const String& map_name)
#ifndef KERNEL
// The Kernel explicitly and exclusively links only this file into it.
// Thus, we cannot even include a reference to the symbol `CharacterMapFile::load_from_file`.
Optional<CharacterMap> CharacterMap::load_from_file(const String& map_name)
{
#ifdef KERNEL
m_character_map_data = default_character_map;
#else
auto result = CharacterMapFile::load_from_file(map_name);
ASSERT(result.has_value());
if (!result.has_value())
return {};
m_character_map_data = result.value();
#endif
m_character_map_name = map_name;
return CharacterMap(map_name, result.value());
}
#endif
CharacterMap::CharacterMap(const String& map_name, const CharacterMapData& map_data)
: m_character_map_data(map_data)