cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 集中梳理代码警告 

RCA：
SOL：
修改人：liangxia
检视人：
This commit is contained in:
liangxia 2019-09-06 15:21:07 +08:00
parent 3a446f24f9
commit c5f55061c6
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Platform/user/configm/config-server/log_config/log_config_cm.h
View File

@ -27,7 +27,9 @@
return RET_INPUTERR; \
} \
\
ULOG_DEBUG(g_log_h, "json input: %s", cJSON_Print(json_obj)); \
char *print_str = cJSON_Print(json_obj); \
ULOG_DEBUG(g_log_h, "json input: %s", print_str); \
free(print_str); \
\
s2j_create_struct_obj(st, type /*log_console_t*/); \
if(st == NULL) { \

3
Platform/user/configm/config-server/log_config/log_config_console.c
View File

@ -19,7 +19,6 @@ ret_code log_console_config_proc(uint source, uint config_type,
static ret_code cm_get_log_console_elems(log_console_t *log_console_conf, int *err_no)
{
char tmp_module[MAX_MODULE_NAME_SZ] = "";
u8 tmp_level = 0;
if (NULL == log_console_conf || NULL == err_no)
@ -35,6 +34,8 @@ static ret_code cm_get_log_console_elems(log_console_t *log_console_conf, int *e
}
else
{
char tmp_module[MAX_MODULE_NAME_SZ] = "";
log_console_conf->on = LOG_ON;
memset(tmp_module, 0, MAX_MODULE_NAME_SZ);

3
Platform/user/configm/config-server/log_config/log_config_monitor.c
View File

@ -19,7 +19,6 @@ ret_code log_monitor_config_proc(uint source, uint config_type,
static ret_code cm_get_log_monitor_elems(log_console_t *log_console_conf, int *err_no)
{
char tmp_module[MAX_MODULE_NAME_SZ] = "";
u8 tmp_level = 0;
if (NULL == log_console_conf || NULL == err_no)
@ -35,6 +34,8 @@ static ret_code cm_get_log_monitor_elems(log_console_t *log_console_conf, int *e
}
else
{
char tmp_module[MAX_MODULE_NAME_SZ] = "";
log_console_conf->on = LOG_ON;
memset(tmp_module, 0, MAX_MODULE_NAME_SZ);

8
Platform/user/configm/config-server/log_config/log_config_remote.c
View File

@ -65,7 +65,6 @@ ret_code log_remote_level_config_proc(uint source, uint config_type,
static ret_code cm_get_log_remote_level_elems(log_remote_level_t *log_remote_level, int *err_no)
{
char value[MAX_LINE_SZ] = "";
int tmp_value = 0;
if (NULL == log_remote_level || NULL == err_no)
{
@ -78,7 +77,7 @@ static ret_code cm_get_log_remote_level_elems(log_remote_level_t *log_remote_lev
if (cm_log_get_keyvalue_from_file(CM_LOG_CONF_REMOTE_LEVEL_FILE, LOG_CONF_KEY_REMOTE_LEVEL, value, sizeof(value)) == 0)
{
tmp_value = atoi(value);
int tmp_value = atoi(value);
log_remote_level->level = (u8)tmp_value;
}
@ -137,7 +136,6 @@ ret_code log_remote_level_config_getall(uint source,
{
ret_code ret = RET_OK;
log_remote_level_t *log_remote_level = NULL;
int err_no = 0;
log_remote_level = rpc_new(log_remote_level_t, 1);
ret = log_remote_level_config_get(source, (pointer)log_remote_level, sizeof(log_remote_level_t)*1, output, output_len);
@ -487,8 +485,6 @@ static ret_code cm_log_getall_host_from_file(const char *file_str, log_remote_ho
static ret_code cm_get_log_remote_host_elems(log_remote_host_x_t *input_host, log_remote_host_x_t *ret_hosts, int *cnt, int *err_no)
{
ret_code ret = RET_ERR;
if (NULL == input_host || NULL == ret_hosts || NULL == cnt)
{
return RET_ERR;
@ -506,8 +502,6 @@ static ret_code cm_get_log_remote_host_elems(log_remote_host_x_t *input_host, lo
static ret_code cm_getall_log_remote_host_elems(log_remote_host_x_t *ret_hosts, int *cnt, int *err_no)
{
ret_code ret = RET_ERR;
if (NULL == ret_hosts || NULL == cnt)
{
return RET_ERR;

13
Platform/user/logging/cmd_remote.c
View File

@ -191,7 +191,9 @@ static int logging_remote_json_parse(pointer input, log_remote_host_x_t *config_
return -1;
}
// ULOG_DEBUG(g_log, "remote json parse, json input:%s \n", cJSON_Print(json_obj));
// char *print_str = cJSON_Print(json_obj);
// ULOG_DEBUG(g_log, "remote json parse, json input:%s \n", print_str);
// free(print_str);
s2j_create_struct_obj(log_host_x, log_remote_host_x_t);
if(log_host_x == NULL)
@ -219,7 +221,6 @@ static int logging_remote_json_parse_array(pointer input,
log_remote_host_x_t *config_buff, int *cnt)
{
cJSON *json_obj;
cJSON* p_array;
int json_cnt = 0, i = 0;
int used_cnt = 0;
@ -229,7 +230,9 @@ static int logging_remote_json_parse_array(pointer input,
return -1;
}
// ULOG_DEBUG(g_log, "remote json parse array, json input:%s \n", cJSON_Print(json_obj));
// char *print_str = cJSON_Print(json_obj);
// ULOG_DEBUG(g_log, "remote json parse array, json input:%s \n", print_str);
// free(print_str);
json_cnt = cJSON_GetArraySize(json_obj);
if (json_cnt > MAX_REMOTE_HOST_CNT)
@ -251,7 +254,7 @@ static int logging_remote_json_parse_array(pointer input,
*cnt = 0;
for (i = 0; i < used_cnt; i++)
{
p_array = cJSON_GetArrayItem(json_obj, i);
cJSON* p_array = cJSON_GetArrayItem(json_obj, i);
if (p_array)
{
memset(log_host_x, 0, sizeof(log_remote_host_x_t));
@ -326,7 +329,6 @@ static void logging_get_remote_level_print(log_remote_level_t *log_conf)
static void logging_get_remote_print(log_remote_host_x_t *log_conf, uint cnt)
{
char *tmp_str=NULL;
int i=0;
if (NULL == log_conf || 0 == cnt)
{
@ -356,6 +358,7 @@ static void logging_get_remote_print(log_remote_host_x_t *log_conf, uint cnt)
}
else
{
int i=0;
fprintf(stdout, "--------------------------------------------------------------------------------\n");
fprintf(stdout, " get hosts:\n\n");
for (i=0; i<cnt; i++)