RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:48:12 +00:00
Code Issues Activity Actions

Kernel: Make KString factories return KResultOr + use TRY() everywhere

Browse source 
There are a number of places that don't have an error propagation path
right now, so I've added FIXME's about that.
This commit is contained in:
Andreas Kling 2021-09-06 19:24:54 +02:00
parent 69b9b2888c
commit 56a2594de7
21 changed files with 100 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Kernel/KString.cpp
View file

@ -10,49 +10,43 @@ extern bool g_in_early_boot;
namespace Kernel {
OwnPtr<KString> KString::try_create(StringView const& string)
KResultOr<NonnullOwnPtr<KString>> KString::try_create(StringView string)
{
char* characters = nullptr;
size_t length = string.length();
auto new_string = KString::try_create_uninitialized(length, characters);
if (!new_string)
return {};
auto new_string = TRY(KString::try_create_uninitialized(length, characters));
if (!string.is_empty())
__builtin_memcpy(characters, string.characters_without_null_termination(), length);
characters[length] = '\0';
return new_string;
}
NonnullOwnPtr<KString> KString::must_create(StringView const& string)
NonnullOwnPtr<KString> KString::must_create(StringView string)
{
// We can only enforce success during early boot.
VERIFY(g_in_early_boot);
auto kstring = KString::try_create(string);
VERIFY(kstring != nullptr);
return kstring.release_nonnull();
return KString::try_create(string).release_value();
}
OwnPtr<KString> KString::try_create_uninitialized(size_t length, char*& characters)
KResultOr<NonnullOwnPtr<KString>> KString::try_create_uninitialized(size_t length, char*& characters)
{
size_t allocation_size = sizeof(KString) + (sizeof(char) * length) + sizeof(char);
auto* slot = kmalloc(allocation_size);
if (!slot)
return {};
auto* new_string = new (slot) KString(length);
return ENOMEM;
auto new_string = TRY(adopt_nonnull_own_or_enomem(new (slot) KString(length)));
characters = new_string->m_characters;
return adopt_own_if_nonnull(new_string);
return new_string;
}
NonnullOwnPtr<KString> KString::must_create_uninitialized(size_t length, char*& characters)
{
// We can only enforce success during early boot.
VERIFY(g_in_early_boot);
auto kstring = KString::try_create_uninitialized(length, characters);
VERIFY(kstring != nullptr);
return kstring.release_nonnull();
return KString::try_create_uninitialized(length, characters).release_value();
}
OwnPtr<KString> KString::try_clone() const
KResultOr<NonnullOwnPtr<KString>> KString::try_clone() const
{
return try_create(view());
}