mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-08-16 17:00:35 +03:00
AK+Kernel: Return KString from UUID::to_string() in the Kernel
This lets us safely handle allocation failure.
This commit is contained in:
parent
5a5766be2c
commit
7f44e54ad6
Notes:
sideshowbarker
2024-07-17 18:41:19 +09:00
Author: https://github.com/IdanHo Commit: https://github.com/SerenityOS/serenity/commit/7f44e54ad6 Pull-request: https://github.com/SerenityOS/serenity/pull/12564 Reviewed-by: https://github.com/MaxWipfli
17
AK/UUID.cpp
17
AK/UUID.cpp
@ -76,6 +76,22 @@ UUID::UUID(StringView uuid_string_view, Endianness endianness)
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
||||
#ifdef KERNEL
|
||||
ErrorOr<NonnullOwnPtr<Kernel::KString>> UUID::to_string() const
|
||||
{
|
||||
StringBuilder builder(36);
|
||||
TRY(builder.try_append(encode_hex(m_uuid_buffer.span().trim(4)).view()));
|
||||
TRY(builder.try_append('-'));
|
||||
TRY(builder.try_append(encode_hex(m_uuid_buffer.span().slice(4).trim(2)).view()));
|
||||
TRY(builder.try_append('-'));
|
||||
TRY(builder.try_append(encode_hex(m_uuid_buffer.span().slice(6).trim(2)).view()));
|
||||
TRY(builder.try_append('-'));
|
||||
TRY(builder.try_append(encode_hex(m_uuid_buffer.span().slice(8).trim(2)).view()));
|
||||
TRY(builder.try_append('-'));
|
||||
TRY(builder.try_append(encode_hex(m_uuid_buffer.span().slice(10).trim(6)).view()));
|
||||
return Kernel::KString::try_create(builder.string_view());
|
||||
}
|
||||
#else
|
||||
String UUID::to_string() const
|
||||
{
|
||||
StringBuilder builder(36);
|
||||
@ -90,6 +106,7 @@ String UUID::to_string() const
|
||||
builder.append(encode_hex(m_uuid_buffer.span().slice(10).trim(6)).view());
|
||||
return builder.to_string();
|
||||
}
|
||||
#endif
|
||||
|
||||
bool UUID::operator==(const UUID& other) const
|
||||
{
|
||||
|
10
AK/UUID.h
10
AK/UUID.h
@ -11,6 +11,12 @@
|
||||
#include <AK/StringView.h>
|
||||
#include <AK/Types.h>
|
||||
|
||||
#ifdef KERNEL
|
||||
# include <Kernel/KString.h>
|
||||
#else
|
||||
# include <AK/String.h>
|
||||
#endif
|
||||
|
||||
namespace AK {
|
||||
|
||||
class UUID {
|
||||
@ -32,7 +38,11 @@ public:
|
||||
bool operator<(const UUID&) const = delete;
|
||||
bool operator>(const UUID&) const = delete;
|
||||
|
||||
#ifdef KERNEL
|
||||
ErrorOr<NonnullOwnPtr<Kernel::KString>> to_string() const;
|
||||
#else
|
||||
String to_string() const;
|
||||
#endif
|
||||
bool is_zero() const;
|
||||
|
||||
private:
|
||||
|
Loading…
Reference in New Issue
Block a user