thunderbrewhq/squall
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/squall.git synced 2025-12-12 02:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(error): improve error macros

Browse source
This commit is contained in:
fallenoak 2022-12-30 13:43:23 -06:00 • committed by GitHub
parent e5fe4a7e19
commit e3b0c356ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
storm/Error.hpp
View file

@ -13,16 +13,6 @@
#if defined(NDEBUG) #if defined(NDEBUG)
#define STORM_ASSERT(x) \ #define STORM_ASSERT(x) \
if (!(x)) { \
SErrSetLastError(ERROR_INVALID_PARAMETER); \
return 0; \
} \
(void)0
#define STORM_ASSERT_VOID(x) \
if (!(x)) { \
SErrSetLastError(ERROR_INVALID_PARAMETER); \
return; \
} \
(void)0 (void)0
#else #else
#define STORM_ASSERT(x) \ #define STORM_ASSERT(x) \
@ -31,13 +21,14 @@
SErrDisplayAppFatal(#x); \ SErrDisplayAppFatal(#x); \
} \ } \
(void)0 (void)0
#define STORM_ASSERT_VOID(x) \ #endif
#define STORM_VALIDATE(x, y, ...) \
if (!(x)) { \ if (!(x)) { \
SErrPrepareAppFatal(__FILE__, __LINE__); \ SErrSetLastError(y); \
SErrDisplayAppFatal(#x); \ return __VA_ARGS__; \
} \ } \
(void)0 (void)0
#endif
[[noreturn]] void SErrDisplayAppFatal(const char* format, ...); [[noreturn]] void SErrDisplayAppFatal(const char* format, ...);

15
storm/String.cpp
View file

@ -208,6 +208,7 @@ void SStrInitialize() {
const char* SStrChr(const char* string, char search) { const char* SStrChr(const char* string, char search) {
STORM_ASSERT(string); STORM_ASSERT(string);
STORM_VALIDATE(string, ERROR_INVALID_PARAMETER, nullptr);
if (!*string) { if (!*string) {
return nullptr; return nullptr;
@ -226,6 +227,7 @@ const char* SStrChr(const char* string, char search) {
const char* SStrChrR(const char* string, char search) { const char* SStrChrR(const char* string, char search) {
STORM_ASSERT(string); STORM_ASSERT(string);
STORM_VALIDATE(string, ERROR_INVALID_PARAMETER, nullptr);
const char* result; const char* result;
@ -255,6 +257,7 @@ int32_t SStrCmpI(const char* string1, const char* string2, size_t maxchars) {
size_t SStrCopy(char* dest, const char* source, size_t destsize) { size_t SStrCopy(char* dest, const char* source, size_t destsize) {
STORM_ASSERT(dest); STORM_ASSERT(dest);
STORM_ASSERT(source); STORM_ASSERT(source);
STORM_VALIDATE(dest && source, ERROR_INVALID_PARAMETER, 0);
char* destbuf = dest; char* destbuf = dest;
@ -423,10 +426,14 @@ const char* SStrStr(const char* string, const char* search) {
} }
void SStrTokenize(const char** string, char* buffer, size_t bufferchars, const char* whitespace, int32_t* quoted) { void SStrTokenize(const char** string, char* buffer, size_t bufferchars, const char* whitespace, int32_t* quoted) {
STORM_ASSERT_VOID(string); STORM_ASSERT(string);
STORM_ASSERT_VOID(*string); STORM_VALIDATE(string, ERROR_INVALID_PARAMETER);
STORM_ASSERT_VOID(buffer || !bufferchars); STORM_ASSERT(*string);
STORM_ASSERT_VOID(whitespace); STORM_VALIDATE(*string, ERROR_INVALID_PARAMETER);
STORM_ASSERT(buffer || !bufferchars);
STORM_VALIDATE(buffer || !bufferchars, ERROR_INVALID_PARAMETER);
STORM_ASSERT(whitespace);
STORM_VALIDATE(whitespace, ERROR_INVALID_PARAMETER);
int32_t inquotes = 0; int32_t inquotes = 0;
int32_t usedquotes = 0; int32_t usedquotes = 0;