diff --git a/src/Filesystem/path.h b/src/Filesystem/path.h index 9a0ced3..8b3d1cc 100644 --- a/src/Filesystem/path.h +++ b/src/Filesystem/path.h @@ -15,7 +15,7 @@ static const char path_notSep='\\'; #endif char* __path_concat(u16 n, ...); -/// @brief merges path parts together and places between them +/// @brief merges path parts together and puts between them /// @return new cstr #define path_concat(PATH_PARTS...) __path_concat(count_args(PATH_PARTS), PATH_PARTS) diff --git a/src/base/errors.c b/src/base/errors.c index a93aff6..6f093f1 100644 --- a/src/base/errors.c +++ b/src/base/errors.c @@ -5,18 +5,18 @@ char* errname(ErrorId err){ switch(err){ - case SUCCESS: return "SUCCESS"; - case ERR_MAXLENGTH: return "ERR_MAXLENGTH"; - case ERR_WRONGTYPE: return "ERR_WRONGTYPE"; - case ERR_WRONGINDEX: return "ERR_WRONGINDEX"; - case ERR_NOTIMPLEMENTED: return "ERR_NOTIMPLEMENTED"; - case ERR_NULLPTR: return "ERR_NULLPTR"; - case ERR_ENDOFSTR: return "ERR_ENDOFSTR"; - case ERR_KEYNOTFOUND: return "ERR_KEYNOTFOUND"; - case ERR_FORMAT: return "ERR_FORMAT"; - case ERR_UNEXPECTEDVAL: return "ERR_UNEXPECTEDVAL"; - case ERR_IO: return "ERR_IO"; - case ERR_IO_EOF: return "ERR_IO_EOF"; + case SUCCESS: return nameof(SUCCESS); + case ERR_MAXLENGTH: return nameof(ERR_MAXLENGTH); + case ERR_WRONGTYPE: return nameof(ERR_WRONGTYPE); + case ERR_WRONGINDEX: return nameof(ERR_WRONGINDEX); + case ERR_NOTIMPLEMENTED: return nameof(ERR_NOTIMPLEMENTED); + case ERR_NULLPTR: return nameof(ERR_NULLPTR); + case ERR_ENDOFSTR: return nameof(ERR_ENDOFSTR); + case ERR_KEYNOTFOUND: return nameof(ERR_KEYNOTFOUND); + case ERR_FORMAT: return nameof(ERR_FORMAT); + case ERR_UNEXPECTEDVAL: return nameof(ERR_UNEXPECTEDVAL); + case ERR_IO: return nameof(ERR_IO); + case ERR_IO_EOF: return nameof(ERR_IO_EOF); default: return "UNKNOWN_ERROR"; } } diff --git a/src/base/std.h b/src/base/std.h index 0055fd1..ac4748a 100644 --- a/src/base/std.h +++ b/src/base/std.h @@ -37,6 +37,8 @@ typedef u8 bool; #define dbg(N) kprintf("\e[95m%d\n",N) +#define nameof(V) #V + #ifdef _MSC_VER #pragma comment(lib, "mincore_downlevel.lib") // Support OS older than SDK #define _CRT_SECURE_NO_WARNINGS 1