Mod aaa-12 修改编译警告

RCA:
SOL:
修改人:huangxin
检视人:huangxin
This commit is contained in:
黄昕 2019-09-02 15:56:35 +08:00
parent bced0a2bf4
commit cd9ec8fb58
4 changed files with 12 additions and 10 deletions
Platform/user/configm/config-server

View File

@ -1,14 +1,14 @@
#include "dhcp_lib.h" #include "dhcp_lib.h"
void dhcp_config_init(void) ret_code dhcp_config_init(void)
{ {
ret_code ret = RET_OK; ret_code ret = RET_OK;
ret = br_event_register(BR_DELETE_EVENT_PRE,del_interface_dhcp_cb); ret = br_event_register(BR_DELETE_EVENT_PRE,del_interface_dhcp_cb);
if(ret != RET_OK){ if(ret != RET_OK){
printf("register failed.\n"); printf("register failed.\n");
return; return ret;
} }
return; return ret;
} }
int del_interface_dhcp_cb(BR_EVENT_TYPE event_type, br_event_t event_arg) int del_interface_dhcp_cb(BR_EVENT_TYPE event_type, br_event_t event_arg)
@ -398,6 +398,7 @@ char *get_interface_ip(char *interface) {
system(cmd); system(cmd);
memset(cmd, 0, 101); memset(cmd, 0, 101);
free(cmd); free(cmd);
return getfilefirstline("/tmp/ip"); return getfilefirstline("/tmp/ip");
} }
@ -412,6 +413,7 @@ char *get_interface_mask(char *interface) {
system(cmd); system(cmd);
memset(cmd, 0, 101); memset(cmd, 0, 101);
free(cmd); free(cmd);
return getfilefirstline("/tmp/mask"); return getfilefirstline("/tmp/mask");
} }

View File

@ -28,7 +28,7 @@
#include "dhcp_dhcpd_lease.h" #include "dhcp_dhcpd_lease.h"
void dhcp_config_init(void); ret_code dhcp_config_init(void);
int del_interface_dhcp_cb(BR_EVENT_TYPE event_type, br_event_t event_arg); int del_interface_dhcp_cb(BR_EVENT_TYPE event_type, br_event_t event_arg);

View File

@ -100,7 +100,7 @@ void vlan_config_format_json_stub(int *interface);
void vlan_config_get_all_stub(uint source); void vlan_config_get_all_stub(uint source);
void vlan_config_get_stub(void); void vlan_config_get_stub(void);
void vlan_config_proc_test(operation_type op_type); void vlan_config_proc_test(operation_type op_type);
void vlan_config_init(void); ret_code vlan_config_init(void);
void vlan_config_stub1(void); void vlan_config_stub1(void);
/* int */ /* int */

View File

@ -203,7 +203,7 @@ interface_model which_interface_model(char *if_name)
* : * :
* : * :
************************************************************/ ************************************************************/
void vlan_config_init(void) ret_code vlan_config_init(void)
{ {
ret_code ret = RET_OK; ret_code ret = RET_OK;
//int sys_ret = 0; //int sys_ret = 0;
@ -213,7 +213,7 @@ void vlan_config_init(void)
ret = br_event_register(BR_IF_LEAVE_EVENT_PRE, del_interface_vlan_cb); ret = br_event_register(BR_IF_LEAVE_EVENT_PRE, del_interface_vlan_cb);
if(ret != RET_OK){ if(ret != RET_OK){
printf("[vlan]vlan_config_init: event register failed(%d).\n", ret); printf("[vlan]vlan_config_init: event register failed(%d).\n", ret);
return; return ret;
} }
#if 0 #if 0
/* 创建br0 */ /* 创建br0 */
@ -242,7 +242,7 @@ void vlan_config_init(void)
return; return;
} }
#endif #endif
return; return ret;
} }
/************************************************************ /************************************************************