diff --git a/include/logging.h b/include/logging.h index 230e4ec..8823d58 100644 --- a/include/logging.h +++ b/include/logging.h @@ -12,16 +12,16 @@ extern "C" { #endif -#define Log_fatal(format, ...) \ - log_fatal(__FILE__, __LINE__, format, ##__VA_ARGS__) -#define Log_error(format, ...) \ - log_error(__FILE__, __LINE__, format, ##__VA_ARGS__) -#define Log_warning(format, ...) \ - log_warning(__FILE__, __LINE__, format, ##__VA_ARGS__) -#define Log_info(format, ...) \ - log_info(__FILE__, __LINE__, format, ##__VA_ARGS__) -#define Log_debug(format, ...) \ - log_debug(__FILE__, __LINE__, format, ##__VA_ARGS__) +#define log_fatal(format, ...) \ + _log_fatal(__FILE__, __LINE__, format, ##__VA_ARGS__) +#define log_error(format, ...) \ + _log_error(__FILE__, __LINE__, format, ##__VA_ARGS__) +#define log_warning(format, ...) \ + _log_warning(__FILE__, __LINE__, format, ##__VA_ARGS__) +#define log_info(format, ...) \ + _log_info(__FILE__, __LINE__, format, ##__VA_ARGS__) +#define log_debug(format, ...) \ + _log_debug(__FILE__, __LINE__, format, ##__VA_ARGS__) typedef struct Logger { log_level level; @@ -32,11 +32,11 @@ typedef struct Logger { bool (*addFilter)(log_filter *filter); } Logger; -void log_fatal(const char *file, int line, const char *format, ...); -void log_error(const char *file, int line, const char *format, ...); -void log_warning(const char *file, int line, const char *format, ...); -void log_info(const char *file, int line, const char *format, ...); -void log_debug(const char *file, int line, const char *format, ...); +void _log_fatal(const char *file, int line, const char *format, ...); +void _log_error(const char *file, int line, const char *format, ...); +void _log_warning(const char *file, int line, const char *format, ...); +void _log_info(const char *file, int line, const char *format, ...); +void _log_debug(const char *file, int line, const char *format, ...); /** * @brief diff --git a/src/logging.c b/src/logging.c index 45e925f..b01ca42 100644 --- a/src/logging.c +++ b/src/logging.c @@ -144,7 +144,7 @@ static void log_cope(log_level level_e, output_to_handler(handler, level, color, message); } -void log_fatal(const char *file, int line, const char *message, ...) { +void _log_fatal(const char *file, int line, const char *message, ...) { if (G_LOGGER->level >= LOG_ERROR) { char logStr[LOG_BUFFER_SIZE]; char finalLogStr[LOG_BUFFER_SIZE * 2]; @@ -158,7 +158,7 @@ void log_fatal(const char *file, int line, const char *message, ...) { } } -void log_error(const char *file, int line, const char *message, ...) { +void _log_error(const char *file, int line, const char *message, ...) { if (G_LOGGER->level >= LOG_ERROR) { char logStr[LOG_BUFFER_SIZE]; char finalLogStr[LOG_BUFFER_SIZE * 2]; @@ -172,7 +172,7 @@ void log_error(const char *file, int line, const char *message, ...) { } } -void log_warning(const char *file, int line, const char *message, ...) { +void _log_warning(const char *file, int line, const char *message, ...) { if (G_LOGGER->level >= LOG_WARNING) { char logStr[LOG_BUFFER_SIZE]; char finalLogStr[LOG_BUFFER_SIZE * 2]; @@ -186,7 +186,7 @@ void log_warning(const char *file, int line, const char *message, ...) { } } -void log_info(const char *file, int line, const char *message, ...) { +void _log_info(const char *file, int line, const char *message, ...) { if (G_LOGGER->level >= LOG_INFO) { char logStr[LOG_BUFFER_SIZE]; char finalLogStr[LOG_BUFFER_SIZE * 2]; @@ -200,7 +200,7 @@ void log_info(const char *file, int line, const char *message, ...) { } } -void log_debug(const char *file, int line, const char *message, ...) { +void _log_debug(const char *file, int line, const char *message, ...) { if (G_LOGGER->level >= LOG_DEBUG) { char logStr[LOG_BUFFER_SIZE]; char finalLogStr[LOG_BUFFER_SIZE * 2]; diff --git a/tests/test-filter.c b/tests/test-filter.c index 813425d..b282ed1 100644 --- a/tests/test-filter.c +++ b/tests/test-filter.c @@ -8,11 +8,11 @@ int main() { Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG); - Log_info("This is an info message"); - Log_error("This is an error message%s", "123"); - Log_fatal("This is an fatal message"); - Log_debug("This is a debug message"); - Log_warning("This is a warning message%s", "123"); + log_info("This is an info message"); + log_error("This is an error message%s", "123"); + log_fatal("This is an fatal message"); + log_debug("This is a debug message"); + log_warning("This is a warning message%s", "123"); char *test1[] = {"This", NULL}; @@ -38,11 +38,11 @@ int main() { printf("filter added\n"); printf("\n"); - Log_info("This is an info message"); - Log_error("This is an error message%s", "123"); - Log_fatal("This is an fatal message"); - Log_debug("This is a debug message"); - Log_warning("This is a warning message%s", "123"); + log_info("This is an info message"); + log_error("This is an error message%s", "123"); + log_fatal("This is an fatal message"); + log_debug("This is a debug message"); + log_warning("This is a warning message%s", "123"); destroyDefaultLogger(); return 0; diff --git a/tests/test-log-file.c b/tests/test-log-file.c index a9753c2..3b04534 100644 --- a/tests/test-log-file.c +++ b/tests/test-log-file.c @@ -6,11 +6,11 @@ int main() { log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); logger->addHandler(hander); - Log_info("This is an info message"); - Log_error("This is an error message%s", "123"); - Log_fatal("This is an fatal message"); - Log_debug("This is a debug message"); - Log_warning("This is a warning message%s", "123"); + log_info("This is an info message"); + log_error("This is an error message%s", "123"); + log_fatal("This is an fatal message"); + log_debug("This is a debug message"); + log_warning("This is a warning message%s", "123"); destroyDefaultLogger(); return 0; diff --git a/tests/test-simple.c b/tests/test-simple.c index 3f7e460..5744e2c 100644 --- a/tests/test-simple.c +++ b/tests/test-simple.c @@ -3,11 +3,11 @@ int main() { Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG); - Log_info("This is an info message"); - Log_error("This is an error message%s", "123"); - Log_fatal("This is an fatal message"); - Log_debug("This is a debug message"); - Log_warning("This is a warning message%s", "123"); + log_info("This is an info message"); + log_error("This is an error message%s", "123"); + log_fatal("This is an fatal message"); + log_debug("This is a debug message"); + log_warning("This is a warning message%s", "123"); destroyDefaultLogger(); return 0;