From e04a9607779ccc5efba646285605a465c4abb3db Mon Sep 17 00:00:00 2001
From: youmetme <321640253@qq.com>
Date: Thu, 28 Nov 2024 18:30:27 +0800
Subject: [PATCH] fix

---
 include/logging/logging-handler.h  |  4 ++--
 src/handler/logging-handler-file.c |  6 +++---
 src/logging.c                      | 18 +++++++++---------
 tests/test-filter.c                |  2 +-
 tests/test-log-file.c              |  2 +-
 tests/test-simple.c                |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/logging/logging-handler.h b/include/logging/logging-handler.h
index e4683ce..b434e1a 100644
--- a/include/logging/logging-handler.h
+++ b/include/logging/logging-handler.h
@@ -16,11 +16,11 @@ typedef struct log_Handler {
 
 /**
  * @brief 文件处理器
- * @param name 文件名
+ * @param file_name 文件名
  * @param max_size 文件最大大小
  * @return
  */
-log_Handler *loggingHandlerFile(const char *name, unsigned int max_size);
+log_Handler *loggingHandlerFile(const char *file_name, unsigned int max_size);
 
 /**
  * @brief 控制台处理器
diff --git a/src/handler/logging-handler-file.c b/src/handler/logging-handler-file.c
index 1e7cc0f..5c7c2c4 100644
--- a/src/handler/logging-handler-file.c
+++ b/src/handler/logging-handler-file.c
@@ -50,7 +50,7 @@ static void outputFileHandler(log_Handler *handler, const char *message) {
         changeFile(handler);
 }
 
-log_Handler *loggingHandlerFile(const char *name, unsigned int max_size) {
+log_Handler *loggingHandlerFile(const char *file_name, unsigned int max_size) {
     char                   new_file_name[FILE_NAME_MAX_SIZE];
     int                    suffix = 0;
     unsigned int           file_size;
@@ -60,7 +60,7 @@ log_Handler *loggingHandlerFile(const char *name, unsigned int max_size) {
 
     /// 获取未写满于设置最大文件大小的文件名
     do {
-        sprintf(new_file_name, "%s_%d.log", name, suffix++);
+        sprintf(new_file_name, "%s_%d.log", file_name, suffix++);
         fp = fopen(new_file_name, "at");
         if (fp == NULL)
             goto ERROR;
@@ -77,7 +77,7 @@ log_Handler *loggingHandlerFile(const char *name, unsigned int max_size) {
     handler_ex->file_size_max = max_size;
     handler_ex->file_size     = file_size;
     handler_ex->suffix        = suffix;
-    handler_ex->file_name     = strdup(name);
+    handler_ex->file_name     = strdup(file_name);
     if (handler_ex->file_name == NULL)
         goto ERROR;
 
diff --git a/src/logging.c b/src/logging.c
index c23d8b6..f9dafbe 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -104,10 +104,10 @@ static void output_to_handler(log_Handler *handler,
  * @param ... 格式化参数列表
  * @return
  */
-static void _builtin_cope(log_level   level_e,
-                          char       *level,
-                          const char *color,
-                          const char *message) {
+static void log_cope(log_level   level_e,
+                     char       *level,
+                     const char *color,
+                     const char *message) {
     if (G_LOGGER == NULL) {
         return;
     }
@@ -136,7 +136,7 @@ void log_fatal(const char *message, ...) {
         va_start(args, message);
         vsprintf(logStr, message, args);
         va_end(args);
-        _builtin_cope(LOG_FATAL, "Fatal", RED_B, logStr);
+        log_cope(LOG_FATAL, "Fatal", RED_B, logStr);
     }
 }
 
@@ -147,7 +147,7 @@ void log_error(const char *message, ...) {
         va_start(args, message);
         vsprintf(logStr, message, args);
         va_end(args);
-        _builtin_cope(LOG_ERROR, "Error", RED, logStr);
+        log_cope(LOG_ERROR, "Error", RED, logStr);
     }
 }
 
@@ -158,7 +158,7 @@ void log_warning(const char *message, ...) {
         va_start(args, message);
         vsprintf(logStr, message, args);
         va_end(args);
-        _builtin_cope(LOG_WARNING, "Warning", YELLOW, logStr);
+        log_cope(LOG_WARNING, "Warning", YELLOW, logStr);
     }
 }
 
@@ -169,7 +169,7 @@ void log_info(const char *message, ...) {
         va_start(args, message);
         vsprintf(logStr, message, args);
         va_end(args);
-        _builtin_cope(LOG_INFO, "Info", GREEN, logStr);
+        log_cope(LOG_INFO, "Info", GREEN, logStr);
     }
 }
 
@@ -180,7 +180,7 @@ void log_debug(const char *message, ...) {
         va_start(args, message);
         vsprintf(logStr, message, args);
         va_end(args);
-        _builtin_cope(LOG_DEBUG, "Debug", CYAN, logStr);
+        log_cope(LOG_DEBUG, "Debug", CYAN, logStr);
     }
 }
 
diff --git a/tests/test-filter.c b/tests/test-filter.c
index 4471569..b282ed1 100644
--- a/tests/test-filter.c
+++ b/tests/test-filter.c
@@ -6,7 +6,7 @@
 #include <time.h>
 
 int main() {
-    Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG);
+    Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG);
 
     log_info("This is an info message");
     log_error("This is an error message%s", "123");
diff --git a/tests/test-log-file.c b/tests/test-log-file.c
index 3b04534..db30d88 100644
--- a/tests/test-log-file.c
+++ b/tests/test-log-file.c
@@ -2,7 +2,7 @@
 #include "logging/logging-handler.h"
 
 int main() {
-    Logger      *logger = newDefaultLogger("testLogger", LOG_DEBUG);
+    Logger      *logger = newDefaultLogger(__FILE__, LOG_DEBUG);
     log_Handler *hander = loggingHandlerFile("test_log", 1024 * 1024 * 10);
     logger->addHandler(hander);
 
diff --git a/tests/test-simple.c b/tests/test-simple.c
index 18251d6..5744e2c 100644
--- a/tests/test-simple.c
+++ b/tests/test-simple.c
@@ -1,7 +1,7 @@
 #include "logging.h"
 
 int main() {
-    Logger *logger = newDefaultLogger("testLogger", LOG_DEBUG);
+    Logger *logger = newDefaultLogger(__FILE__, LOG_DEBUG);
 
     log_info("This is an info message");
     log_error("This is an error message%s", "123");