Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: Allow userspace to use string literals with BAN::Error

This commit is contained in:
Bananymous 2024-10-10 21:54:52 +03:00
parent 2da6776451
commit 44629ba5dd
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
BAN/include/BAN/Errors.h
View File

@ -36,7 +36,14 @@ namespace BAN
{ {
return Error((uint64_t)error | kernel_error_mask); return Error((uint64_t)error | kernel_error_mask);
} }
#else
template<size_t N>
consteval static Error from_literal(const char (&message)[N])
{
return Error(message);
}
#endif #endif
static Error from_errno(int error) static Error from_errno(int error)
{ {
return Error(error); return Error(error);
@ -54,12 +61,15 @@ namespace BAN
} }
#endif #endif
uint64_t get_error_code() const { return m_error_code; } constexpr uint64_t get_error_code() const { return m_error_code; }
const char* get_message() const const char* get_message() const
{ {
#ifdef __is_kernel #ifdef __is_kernel
if (m_error_code & kernel_error_mask) if (m_error_code & kernel_error_mask)
return Kernel::error_string(kernel_error()); return Kernel::error_string(kernel_error());
#else
if (m_message)
return m_message;
#endif #endif
if (auto* desc = strerrordesc_np(m_error_code)) if (auto* desc = strerrordesc_np(m_error_code))
return desc; return desc;
@ -67,11 +77,21 @@ namespace BAN
} }
private: private:
Error(uint64_t error) constexpr Error(uint64_t error)
: m_error_code(error) : m_error_code(error)
{} {}
uint64_t m_error_code; #ifndef __is_kernel
constexpr Error(const char* message)
: m_message(message)
{}
#endif
uint64_t m_error_code { 0 };
#ifndef __is_kernel
const char* m_message { nullptr };
#endif
}; };
template<typename T> template<typename T>