diff --git a/Platform/user/configm/config-server/log_config/log_config_cm.c b/Platform/user/configm/config-server/log_config/log_config_cm.c index cad81f0d1..e0ba16b95 100755 --- a/Platform/user/configm/config-server/log_config/log_config_cm.c +++ b/Platform/user/configm/config-server/log_config/log_config_cm.c @@ -24,7 +24,7 @@ ret_code log_rpc_exec(char* service_name, char* method_name, pointer input, int } -/* 仅适用于以“key=value”方式保存的配置解析,适用于log-sched.conf的解析 */ +/* 浠呴傜敤浜庝互鈥渒ey=value鈥濇柟寮忎繚瀛樼殑閰嶇疆瑙f瀽锛岄傜敤浜巐og-sched.conf鐨勮В鏋 */ ret_code cm_log_get_keyvalue_from_file(const char *file_str, const char *key_str, char *value_str, int value_len) { ret_code ret = RET_ERR; @@ -57,10 +57,10 @@ ret_code cm_log_get_keyvalue_from_file(const char *file_str, const char *key_str pos = strstr(line, key_str); if (pos != NULL) { - /* 跳过key与value间的"=" */ + /* 璺宠繃key涓巚alue闂寸殑"=" */ strcpy(value_str, pos+strlen(key_str)+1); - /* 滤除掉段尾的回车换行 */ + /* 婊ら櫎鎺夋灏剧殑鍥炶溅鎹㈣ */ if ('\n' == value_str[strlen(value_str)-1]) { value_str[strlen(value_str)-1] = '\0'; @@ -80,7 +80,7 @@ ret_code cm_log_get_keyvalue_from_file(const char *file_str, const char *key_str } -/* 检查的文件存在,本函数返回1,否则,本函数返回0 */ +/* 妫鏌ョ殑鏂囦欢瀛樺湪锛屾湰鍑芥暟杩斿洖1锛屽惁鍒欙紝鏈嚱鏁拌繑鍥0 */ int cm_log_check_file_is_exist(const char *file_str) { int is_exist = 0; @@ -91,7 +91,7 @@ int cm_log_check_file_is_exist(const char *file_str) } else { - /* 如果文件存在,access返回0,不存在,access返回-1 */ + /* 濡傛灉鏂囦欢瀛樺湪锛宎ccess杩斿洖0锛屼笉瀛樺湪锛宎ccess杩斿洖-1 */ is_exist = ((access(file_str, 0) == 0) ? 1 : 0); } @@ -99,7 +99,7 @@ int cm_log_check_file_is_exist(const char *file_str) } -/* 适用于log-console.conf与log-pty.conf的解析 */ +/* 閫傜敤浜巐og-console.conf涓巐og-pty.conf鐨勮В鏋 */ ret_code cm_log_get_module_from_file(const char *file_str, char *value_str, int value_len) { ret_code ret = RET_ERR; @@ -154,7 +154,7 @@ ret_code cm_log_get_module_from_file(const char *file_str, char *value_str, int return ret; } -/* 适用于log-console.conf与log-pty.conf的解析 */ +/* 閫傜敤浜巐og-console.conf涓巐og-pty.conf鐨勮В鏋 */ ret_code cm_log_get_level_from_file(const char *file_str, u8 *value) { ret_code ret = RET_ERR; diff --git a/Platform/user/configm/config-server/log_config/log_config_file.c b/Platform/user/configm/config-server/log_config/log_config_file.c index 15d05c630..0d297c68e 100755 --- a/Platform/user/configm/config-server/log_config/log_config_file.c +++ b/Platform/user/configm/config-server/log_config/log_config_file.c @@ -38,9 +38,9 @@ static ret_code cm_get_log_file_elems(log_file_t *log_file_conf, int *err_no) memset(log_file_conf, 0, sizeof(*log_file_conf)); - /* level、path、is_compress、del_over_days暂未实现 */ + /* level銆乸ath銆乮s_compress銆乨el_over_days鏆傛湭瀹炵幇 */ - /* 日志文件大小上限:del_over_size */ + /* 鏃ュ織鏂囦欢澶у皬涓婇檺锛歞el_over_size */ memset(value, 0, MAX_LINE_SZ); if (cm_log_get_keyvalue_from_file(CM_LOG_CONF_LOGFILE_FILE, LOG_CONF_KEY_FILE_MAX_SIZE_STR, value, sizeof(value)) == 0) { diff --git a/Platform/user/configm/config-server/log_config/log_config_remote.c b/Platform/user/configm/config-server/log_config/log_config_remote.c index 6ca945a44..55c758cdd 100755 --- a/Platform/user/configm/config-server/log_config/log_config_remote.c +++ b/Platform/user/configm/config-server/log_config/log_config_remote.c @@ -166,7 +166,7 @@ static ret_code cm_log_prase_host_from_str(char *const input_str, log_remote_hos memset(tmp_str, 0, sizeof(tmp_str)); - /* 提取日志等级 */ + /* 鎻愬彇鏃ュ織绛夌骇 */ while (1) { pos2 = strstr(pos, ".="); @@ -202,7 +202,7 @@ static ret_code cm_log_prase_host_from_str(char *const input_str, log_remote_hos } ret_host->level = (u8)tmp_value; - /* 提取IP地址 */ + /* 鎻愬彇IP鍦板潃 */ pos = strstr(pos2, "@"); if (NULL == pos) { @@ -230,7 +230,7 @@ static ret_code cm_log_prase_host_from_str(char *const input_str, log_remote_hos strncpy(ret_host->host, pos, tmp_len); - /* 提取端口 */ + /* 鎻愬彇绔彛 */ pos2 ++; pos = pos2; pos2 = strstr(pos, ":"); @@ -250,7 +250,7 @@ static ret_code cm_log_prase_host_from_str(char *const input_str, log_remote_hos } ret_host->port = (u16)tmp_value; - /* 提取日志存放格式 */ + /* 鎻愬彇鏃ュ織瀛樻斁鏍煎紡 */ pos2++; pos = pos2; @@ -415,7 +415,7 @@ static ret_code cm_log_getall_host_from_file(const char *file_str, log_remote_ho if (hosts[cnt].host[0] == '\0') { - /* 无效数据 */ + /* 鏃犳晥鏁版嵁 */ memset(hosts+cnt, 0, sizeof(log_remote_host_x_t)); continue; } diff --git a/Platform/user/logging/logging_main.c b/Platform/user/logging/logging_main.c index b47007d56..ff73c9be6 100755 --- a/Platform/user/logging/logging_main.c +++ b/Platform/user/logging/logging_main.c @@ -84,8 +84,8 @@ static void logging_usage() fprintf(stdout, " %s %s \n", LOGGING_MODULE_NAME, g_log_cmd[3].cmd); fprintf(stdout, " %s %s get\n", LOGGING_MODULE_NAME, g_log_cmd[3].cmd); fprintf(stdout, " = emerg | alert | crit | err | warn | notice | info | debug \n"); - fprintf(stdout, " eg: %s %s info\n", LOGGING_MODULE_NAME, g_log_cmd[3].cmd); - fprintf(stdout, " %s %s get\n", LOGGING_MODULE_NAME, g_log_cmd[3].cmd); + fprintf(stdout, " eg: %s %s info\n", LOGGING_MODULE_NAME, g_log_cmd[3].cmd); + fprintf(stdout, " %s %s get\n", LOGGING_MODULE_NAME, g_log_cmd[3].cmd); fprintf(stdout, "\n"); fprintf(stdout, "5. usage of %s %s:\n", LOGGING_MODULE_NAME, g_log_cmd[4].cmd); @@ -96,8 +96,8 @@ static void logging_usage() fprintf(stdout, " = 0 | 1 , which 0 is syslog files is not compress while 1 is compress\n"); fprintf(stdout, " is the syslog files life-time (days)\n"); fprintf(stdout, " is the syslog files life-size (bytes)\n"); - fprintf(stdout, " eg: %s %s info /var/log/syslog-files 0 100 1024000\n", LOGGING_MODULE_NAME, g_log_cmd[4].cmd); - fprintf(stdout, " %s %s get\n", LOGGING_MODULE_NAME, g_log_cmd[4].cmd); + fprintf(stdout, " eg: %s %s info /var/log/syslog-files 0 100 1024000\n", LOGGING_MODULE_NAME, g_log_cmd[4].cmd); + fprintf(stdout, " %s %s get\n", LOGGING_MODULE_NAME, g_log_cmd[4].cmd); fprintf(stdout, "-----------------------------------------------------------------------------------------\n"); } diff --git a/Platform/user/ulog/log-sched/log_console.c b/Platform/user/ulog/log-sched/log_console.c index cbe01535a..08fca2ebf 100755 --- a/Platform/user/ulog/log-sched/log_console.c +++ b/Platform/user/ulog/log-sched/log_console.c @@ -172,7 +172,7 @@ ret_code console_initial() memset(ttyfile_str, 0, sizeof(ttyfile_str)); strncpy(ttyfile_str, pos, str_len); - /* 滤除掉段尾的回车换行 */ + /* 婊ら櫎鎺夋灏剧殑鍥炶溅鎹㈣ */ if ('\n' == ttyfile_str[strlen(ttyfile_str)-1]) { ttyfile_str[strlen(ttyfile_str)-1] = '\0';