mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-21 18:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

AK: Rework error types to store kind as an enum

Browse source 
This commit makes windows errors store the code instead of being a
formatted string literal. This will allow comparing against the error,
and checking what it is. The formatting is now done in the formatter,
and moved to an implementation file to avoid polluting headers with
windows.h. The kind of the error is now determined by an enum Kind which
will allow matching against the error kind.

Co-Authored-By: Andrew Kaster <andrew@ladybird.org>
This commit is contained in:
R-Goc 2025-04-04 09:08:13 +02:00 • committed by Andrew Kaster
commit 79b652c74e
Notes: github-actions[bot] 2025-05-10 06:04:30 +00:00
4 changed files with 88 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

54
AK/Format.cpp
View file

@ -4,9 +4,13 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/Assertions.h>
#include <AK/ByteString.h>
#include <AK/CharacterTypes.h>
#include <AK/Error.h>
#include <AK/Format.h>
#include <AK/GenericLexer.h>
#include <AK/HashMap.h>
#include <AK/IntegralMath.h>
#include <AK/LexicalPath.h>
#include <AK/String.h>
@ -1087,6 +1091,56 @@ void vout(FILE* file, StringView fmtstr, TypeErasedFormatParams& params, bool ne
dbgln("vout() failed ({} written out of {}), error was {} ({})", retval, string.length(), error, strerror(error));
}
}
#if defined(AK_OS_WINDOWS)
ErrorOr<void> Formatter<Error>::format_windows_error(FormatBuilder& builder, Error const& error)
{
thread_local HashMap<u32, ByteString> windows_errors;
int code = error.code();
Optional<ByteString&> string = windows_errors.get(static_cast<u32>(code));
if (string.has_value()) {
return Formatter<StringView>::format(builder, string->view());
}
TCHAR* message = nullptr;
u32 size = FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr,
static_cast<DWORD>(code),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
message,
0,
nullptr);
if (size == 0) {
auto format_error = GetLastError();
return Formatter<FormatString>::format(builder, "Error {:08x} when formatting code {:08x}"sv, format_error, code);
}
auto& string_in_map = windows_errors.ensure(code, [message, size] { return ByteString { message, size }; });
LocalFree(message);
return Formatter<StringView>::format(builder, string_in_map.view());
}
#else
ErrorOr<void> Formatter<Error>::format_windows_error(FormatBuilder&, Error const&)
{
VERIFY_NOT_REACHED();
}
#endif
ErrorOr<void> Formatter<Error>::format(FormatBuilder& builder, Error const& error)
{
switch (error.kind()) {
case Error::Kind::Syscall:
return Formatter<FormatString>::format(builder, "{}: {} (errno={})"sv, error.string_literal(), strerror(error.code()), error.code());
case Error::Kind::Errno:
return Formatter<FormatString>::format(builder, "{} (errno={})"sv, strerror(error.code()), error.code());
case Error::Kind::Windows:
return Formatter<Error>::format_windows_error(builder, error);
case Error::Kind::StringLiteral:
return Formatter<FormatString>::format(builder, "{}"sv, error.string_literal());
}
VERIFY_NOT_REACHED();
}
#ifdef AK_OS_ANDROID
static char const* s_log_tag_name = "Serenity";