refactor: 隐藏原始函数
This commit is contained in:
		| @@ -12,16 +12,16 @@ | |||||||
| extern "C" { | extern "C" { | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #define Log_fatal(format, ...)                                                 \ | #define log_fatal(format, ...)                                                 \ | ||||||
|     log_fatal(__FILE__, __LINE__, format, ##__VA_ARGS__) |     _log_fatal(__FILE__, __LINE__, format, ##__VA_ARGS__) | ||||||
| #define Log_error(format, ...)                                                 \ | #define log_error(format, ...)                                                 \ | ||||||
|     log_error(__FILE__, __LINE__, format, ##__VA_ARGS__) |     _log_error(__FILE__, __LINE__, format, ##__VA_ARGS__) | ||||||
| #define Log_warning(format, ...)                                               \ | #define log_warning(format, ...)                                               \ | ||||||
|     log_warning(__FILE__, __LINE__, format, ##__VA_ARGS__) |     _log_warning(__FILE__, __LINE__, format, ##__VA_ARGS__) | ||||||
| #define Log_info(format, ...)                                                  \ | #define log_info(format, ...)                                                  \ | ||||||
|     log_info(__FILE__, __LINE__, format, ##__VA_ARGS__) |     _log_info(__FILE__, __LINE__, format, ##__VA_ARGS__) | ||||||
| #define Log_debug(format, ...)                                                 \ | #define log_debug(format, ...)                                                 \ | ||||||
|     log_debug(__FILE__, __LINE__, format, ##__VA_ARGS__) |     _log_debug(__FILE__, __LINE__, format, ##__VA_ARGS__) | ||||||
|  |  | ||||||
| typedef struct Logger { | typedef struct Logger { | ||||||
|     log_level    level; |     log_level    level; | ||||||
| @@ -32,11 +32,11 @@ typedef struct Logger { | |||||||
|     bool (*addFilter)(log_filter *filter); |     bool (*addFilter)(log_filter *filter); | ||||||
| } Logger; | } Logger; | ||||||
|  |  | ||||||
| void log_fatal(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_error(const char *file, int line, const char *format, ...); | ||||||
| void log_warning(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_info(const char *file, int line, const char *format, ...); | ||||||
| void log_debug(const char *file, int line, const char *format, ...); | void _log_debug(const char *file, int line, const char *format, ...); | ||||||
|  |  | ||||||
| /** | /** | ||||||
| * @brief | * @brief | ||||||
|   | |||||||
| @@ -144,7 +144,7 @@ static void log_cope(log_level   level_e, | |||||||
|     output_to_handler(handler, level, color, message); |     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) { |     if (G_LOGGER->level >= LOG_ERROR) { | ||||||
|         char    logStr[LOG_BUFFER_SIZE]; |         char    logStr[LOG_BUFFER_SIZE]; | ||||||
|         char    finalLogStr[LOG_BUFFER_SIZE * 2]; |         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) { |     if (G_LOGGER->level >= LOG_ERROR) { | ||||||
|         char    logStr[LOG_BUFFER_SIZE]; |         char    logStr[LOG_BUFFER_SIZE]; | ||||||
|         char    finalLogStr[LOG_BUFFER_SIZE * 2]; |         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) { |     if (G_LOGGER->level >= LOG_WARNING) { | ||||||
|         char    logStr[LOG_BUFFER_SIZE]; |         char    logStr[LOG_BUFFER_SIZE]; | ||||||
|         char    finalLogStr[LOG_BUFFER_SIZE * 2]; |         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) { |     if (G_LOGGER->level >= LOG_INFO) { | ||||||
|         char    logStr[LOG_BUFFER_SIZE]; |         char    logStr[LOG_BUFFER_SIZE]; | ||||||
|         char    finalLogStr[LOG_BUFFER_SIZE * 2]; |         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) { |     if (G_LOGGER->level >= LOG_DEBUG) { | ||||||
|         char    logStr[LOG_BUFFER_SIZE]; |         char    logStr[LOG_BUFFER_SIZE]; | ||||||
|         char    finalLogStr[LOG_BUFFER_SIZE * 2]; |         char    finalLogStr[LOG_BUFFER_SIZE * 2]; | ||||||
|   | |||||||
| @@ -8,11 +8,11 @@ | |||||||
| int main() { | int main() { | ||||||
|     Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG); |     Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG); | ||||||
|  |  | ||||||
|     Log_info("This is an info message"); |     log_info("This is an info message"); | ||||||
|     Log_error("This is an error message%s", "123"); |     log_error("This is an error message%s", "123"); | ||||||
|     Log_fatal("This is an fatal message"); |     log_fatal("This is an fatal message"); | ||||||
|     Log_debug("This is a debug message"); |     log_debug("This is a debug message"); | ||||||
|     Log_warning("This is a warning message%s", "123"); |     log_warning("This is a warning message%s", "123"); | ||||||
|  |  | ||||||
|     char *test1[] = {"This", NULL}; |     char *test1[] = {"This", NULL}; | ||||||
|  |  | ||||||
| @@ -38,11 +38,11 @@ int main() { | |||||||
|     printf("filter added\n"); |     printf("filter added\n"); | ||||||
|     printf("\n"); |     printf("\n"); | ||||||
|  |  | ||||||
|     Log_info("This is an info message"); |     log_info("This is an info message"); | ||||||
|     Log_error("This is an error message%s", "123"); |     log_error("This is an error message%s", "123"); | ||||||
|     Log_fatal("This is an fatal message"); |     log_fatal("This is an fatal message"); | ||||||
|     Log_debug("This is a debug message"); |     log_debug("This is a debug message"); | ||||||
|     Log_warning("This is a warning message%s", "123"); |     log_warning("This is a warning message%s", "123"); | ||||||
|  |  | ||||||
|     destroyDefaultLogger(); |     destroyDefaultLogger(); | ||||||
|     return 0; |     return 0; | ||||||
|   | |||||||
| @@ -6,11 +6,11 @@ int main() { | |||||||
|     log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); |     log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10); | ||||||
|     logger->addHandler(hander); |     logger->addHandler(hander); | ||||||
|  |  | ||||||
|     Log_info("This is an info message"); |     log_info("This is an info message"); | ||||||
|     Log_error("This is an error message%s", "123"); |     log_error("This is an error message%s", "123"); | ||||||
|     Log_fatal("This is an fatal message"); |     log_fatal("This is an fatal message"); | ||||||
|     Log_debug("This is a debug message"); |     log_debug("This is a debug message"); | ||||||
|     Log_warning("This is a warning message%s", "123"); |     log_warning("This is a warning message%s", "123"); | ||||||
|  |  | ||||||
|     destroyDefaultLogger(); |     destroyDefaultLogger(); | ||||||
|     return 0; |     return 0; | ||||||
|   | |||||||
| @@ -3,11 +3,11 @@ | |||||||
| int main() { | int main() { | ||||||
|     Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG); |     Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG); | ||||||
|  |  | ||||||
|     Log_info("This is an info message"); |     log_info("This is an info message"); | ||||||
|     Log_error("This is an error message%s", "123"); |     log_error("This is an error message%s", "123"); | ||||||
|     Log_fatal("This is an fatal message"); |     log_fatal("This is an fatal message"); | ||||||
|     Log_debug("This is a debug message"); |     log_debug("This is a debug message"); | ||||||
|     Log_warning("This is a warning message%s", "123"); |     log_warning("This is a warning message%s", "123"); | ||||||
|  |  | ||||||
|     destroyDefaultLogger(); |     destroyDefaultLogger(); | ||||||
|     return 0; |     return 0; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user