SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Improve error propagation in CommandLine code

Browse Source
This commit is contained in:
Undefine authored and Lucas Chollet committed 2026-11-06 20:34:06 +01:00
1 parent 74ea69459c
commit 8ab8e7db0f
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Kernel/Boot/CommandLine.cpp
+5 -5
View File
@@ -40,13 +40,13 @@ UNMAP_AFTER_INIT void CommandLine::initialize()
(void)s_the->panic_mode(Validate::Yes);
}
UNMAP_AFTER_INIT NonnullOwnPtr<KString> CommandLine::build_commandline(StringView cmdline_from_bootloader)
UNMAP_AFTER_INIT ErrorOr<NonnullOwnPtr<KString>> CommandLine::build_commandline(StringView cmdline_from_bootloader)
{
StringBuilder builder;
builder.append(cmdline_from_bootloader);
TRY(builder.try_append(cmdline_from_bootloader));
if constexpr (!s_embedded_cmd_line.is_empty()) {
builder.append(' ');
builder.append(s_embedded_cmd_line);
TRY(builder.try_append(' '));
TRY(builder.try_append(s_embedded_cmd_line));
}
return KString::must_create(builder.string_view());
}
@@ -68,7 +68,7 @@ UNMAP_AFTER_INIT void CommandLine::add_arguments(Vector<StringView> const& args)
}
UNMAP_AFTER_INIT CommandLine::CommandLine(StringView cmdline_from_bootloader)
: m_string(build_commandline(cmdline_from_bootloader))
: m_string(MUST(build_commandline(cmdline_from_bootloader)))
{
s_the = this;
auto const& args = m_string->view().split_view(' ');
Kernel/Boot/CommandLine.h
+1 -1
View File
@@ -112,7 +112,7 @@ private:
CommandLine(StringView);
void add_arguments(Vector<StringView> const& args);
static NonnullOwnPtr<KString> build_commandline(StringView cmdline_from_bootloader);
static ErrorOr<NonnullOwnPtr<KString>> build_commandline(StringView cmdline_from_bootloader);
NonnullOwnPtr<KString> m_string;
HashMap<StringView, StringView> m_params;