diff options
| author | Clement Sibille <clements+git@lisible.xyz> | 2024-05-20 23:08:52 +0900 |
|---|---|---|
| committer | Clement Sibille <clements+git@lisible.xyz> | 2024-05-20 23:08:52 +0900 |
| commit | 520271db3fbf7f0cf488322a024c0f2f3cfecdc9 (patch) | |
| tree | d43971d53b4dc38b8c909332c8a3520866783fb2 | |
| parent | 06adbda82803d81f565eb72b42f35339eb5c2720 (diff) | |
Remove LOG0 macros
Now LOG can be used in all cases
| -rw-r--r-- | src/lisiblestd/assert.h | 4 | ||||
| -rw-r--r-- | src/lisiblestd/log.h | 31 | ||||
| -rw-r--r-- | src/lisiblestd/vec.h | 2 |
3 files changed, 13 insertions, 24 deletions
diff --git a/src/lisiblestd/assert.h b/src/lisiblestd/assert.h index 7a9ce46..9bd998b 100644 --- a/src/lisiblestd/assert.h +++ b/src/lisiblestd/assert.h @@ -8,14 +8,14 @@ extern void exit(int); #define LSTD_ASSERT(expr) \ do { \ if (!(expr)) { \ - LOG(LogLevel_Error, "Assertion failed:\n\t%s", #expr); \ + LOG_ERROR("Assertion failed:\n\t%s", #expr); \ exit(1); \ } \ } while (0) #define LSTD_UNIMPLEMENTED() \ do { \ - LOG0(LogLevel_Error, "Unimplemented code reached"); \ + LOG_ERROR("Unimplemented code reached"); \ exit(1); \ } while (0) diff --git a/src/lisiblestd/log.h b/src/lisiblestd/log.h index 1fa6ad3..f4b4d6f 100644 --- a/src/lisiblestd/log.h +++ b/src/lisiblestd/log.h @@ -15,31 +15,20 @@ typedef enum { extern LogLevel lstd_log_level; -#define LOG0(log_level, msg) \ +#define LOG(log_level, ...) \ do { \ if (lstd_log_level <= log_level) { \ - fprintf(stderr, LSTD_LOG_PREFIX "%s\n", log_level_to_str(log_level), \ - __FILE__, __LINE__, msg); \ + fprintf(stderr, LSTD_LOG_PREFIX, log_level_to_str(log_level), __FILE__, \ + __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ } \ } while (0) -#define LOG0_TRACE(msg) LOG0(LogLevel_Trace, msg) -#define LOG0_DEBUG(msg) LOG0(LogLevel_Debug, msg) -#define LOG0_WARN(msg) LOG0(LogLevel_Warn, msg) -#define LOG0_ERROR(msg) LOG0(LogLevel_Error, msg) -#define LOG0_INFO(msg) LOG0(LogLevel_Info, msg) - -#define LOG(log_level, fmt, ...) \ - do { \ - if (lstd_log_level <= log_level) { \ - fprintf(stderr, LSTD_LOG_PREFIX fmt "\n", log_level_to_str(log_level), \ - __FILE__, __LINE__, __VA_ARGS__); \ - } \ - } while (0) -#define LOG_TRACE(fmt, ...) LOG(LogLevel_Trace, fmt, __VA_ARGS__) -#define LOG_DEBUG(fmt, ...) LOG(LogLevel_Debug, fmt, __VA_ARGS__) -#define LOG_WARN(fmt, ...) LOG(LogLevel_Warn, fmt, __VA_ARGS__) -#define LOG_ERROR(fmt, ...) LOG(LogLevel_Error, fmt, __VA_ARGS__) -#define LOG_INFO(fmt, ...) LOG(LogLevel_Info, fmt, __VA_ARGS__) +#define LOG_TRACE(...) LOG(LogLevel_Trace, __VA_ARGS__) +#define LOG_DEBUG(...) LOG(LogLevel_Debug, __VA_ARGS__) +#define LOG_WARN(...) LOG(LogLevel_Warn, __VA_ARGS__) +#define LOG_ERROR(...) LOG(LogLevel_Error, __VA_ARGS__) +#define LOG_INFO(...) LOG(LogLevel_Info, __VA_ARGS__) void lstd_log_init(void); const char *log_level_to_str(LogLevel log_level); diff --git a/src/lisiblestd/vec.h b/src/lisiblestd/vec.h index 6592bc4..3829798 100644 --- a/src/lisiblestd/vec.h +++ b/src/lisiblestd/vec.h @@ -57,7 +57,7 @@ new_capacity * sizeof(T)); \ if (!vec->data) { \ /* TODO maybe improve that error handling? */ \ - LOG0_ERROR("Vec reallocation failed, no memory left"); \ + LOG_ERROR("Vec reallocation failed, no memory left"); \ abort(); \ } \ vec->capacity = new_capacity; \ |