[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/goahead/interface5.0/zte_web_mc.c b/ap/app/goahead/interface5.0/zte_web_mc.c
index 908dc61..dcd26c4 100644
--- a/ap/app/goahead/interface5.0/zte_web_mc.c
+++ b/ap/app/goahead/interface5.0/zte_web_mc.c
@@ -36,7 +36,7 @@
/*check the input param*/
if (msg_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_send_msg fun's input param is valid!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_send_msg fun's input param is valid!"); /*lint !e26*/
return -1;
}
@@ -47,18 +47,18 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_SendReq) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_send_msg_ui_req_info_s_type is more than the msg buf , sizeof(zte_sms_send_msg_ui_req_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_send_msg_ui_req_info_s_type is more than the msg buf , sizeof(sms_send_msg_ui_req_info_s_type) = %d!"
, sizeof(T_zUfiSms_SendReq));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, msg_ptr, sizeof(T_zUfiSms_SendReq));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms send msg start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms send msg start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_SEND_SMS, sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_SEND_SMS, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms send msg end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms send msg end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send msg fail"); /*lint !e26*/
@@ -98,17 +98,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_ModifyFlag) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_mc_relay_sms_modify_s_type is more than the msg buf , sizeof(zte_mc_relay_sms_modify_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of mc_relay_sms_modify_s_type is more than the msg buf , sizeof(mc_relay_sms_modify_s_type) = %d!"
, sizeof(T_zUfiSms_ModifyFlag));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, modify_info_tmp, sizeof(T_zUfiSms_ModifyFlag));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms modify tag start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms modify tag start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_SMS_MODIFY_TAG, sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_SMS_MODIFY_TAG, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms modify tag end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms modify tag end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send modify tag msg fail"); /*lint !e26*/
@@ -138,7 +138,7 @@
/*check the input param*/
if (msg_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_write_msg fun's input param is valid!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_write_msg fun's input param is valid!"); /*lint !e26*/
return -1;
}
@@ -149,17 +149,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_SaveReq) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_write_msg_info_s_type is more than the msg buf , sizeof(zte_sms_write_msg_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_write_msg_info_s_type is more than the msg buf , sizeof(sms_write_msg_info_s_type) = %d!"
, sizeof(T_zUfiSms_SaveReq));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, msg_ptr, sizeof(T_zUfiSms_SaveReq));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms write msg start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms write msg start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_DRAFTS_SAVE,sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_DRAFTS_SAVE, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms write msg end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms write msg end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send write msg fail"); /*lint !e26*/
@@ -189,14 +189,14 @@
/*check the input param*/
if (del_info_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"the zte_mc_relay_sms_delete_msg fun's input param is valid!");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"the mc_relay_sms_delete_msg fun's input param is valid!");/*lint !e26*/
return -1;
}
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_DelReq) > MSG_DATA_MAX_LEN) {
- slog(MISC_PRINT, SLOG_ERR,"the size of zte_sms_delete_msg_info_s_type is more than the msg buf , sizeof(zte_sms_delete_msg_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR,"the size of sms_delete_msg_info_s_type is more than the msg buf , sizeof(sms_delete_msg_info_s_type) = %d!"
, sizeof(T_zUfiSms_DelReq));/*lint !e26*/
return -1;
}
@@ -207,7 +207,7 @@
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL, MSG_CMD_DEL_SMS_BY_INDEX, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_DEL_SMS_BY_INDEX, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr, 0);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_send_message sms delete msg end!");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"send_message sms delete msg end!");/*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR,"mc lib relay sms send delete msg fail");/*lint !e26*/
return -1;
@@ -233,26 +233,26 @@
/*check the input param*/
if (del_info_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_move_to_sim_msg fun's input param is valid!");
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_move_to_sim_msg fun's input param is valid!");
return -1;
}
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_DelReq) > MSG_DATA_MAX_LEN) {
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_delete_msg_info_s_type is more than the msg buf , sizeof(zte_sms_delete_msg_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_delete_msg_info_s_type is more than the msg buf , sizeof(sms_delete_msg_info_s_type) = %d!"
, sizeof(T_zUfiSms_DelReq));
return -1;
}
#endif
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms move to sim msg start!");
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms move to sim msg start!");
//slog(MISC_PRINT,SLOG_DEBUG,"del_info_ptr->db is %d\n",del_info_ptr->db);
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL, MSG_CMD_COPY_SMS, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_COPY_SMS, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms move to sim msg end!");
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms move to sim msg end!");
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send move to sim msg fail");
return -1;
@@ -279,7 +279,7 @@
/*check the input param*/
if (parameter_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_set_parameter fun's input param is valid!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_set_parameter fun's input param is valid!"); /*lint !e26*/
return -1;
}
@@ -290,17 +290,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_ParaInfo) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_parameter_info_s_type is more than the msg buf , sizeof(zte_sms_parameter_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_parameter_info_s_type is more than the msg buf , sizeof(sms_parameter_info_s_type) = %d!"
, sizeof(T_zUfiSms_ParaInfo));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, parameter_ptr, sizeof(T_zUfiSms_ParaInfo));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms set parameter( start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms set parameter( start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_SMS_LOCATION_SET, sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_SMS_LOCATION_SET, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms set parameter( end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms set parameter( end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms set parameter msg fail"); /*lint !e26*/
@@ -332,11 +332,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_create_modify_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_create_modify_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_create_modify_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_create_modify_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -345,17 +345,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_create_ext_record_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_create_ext_record_s_type is more than the msg buf , sizeof(zte_pbm_create_ext_record_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_create_ext_record_s_type is more than the msg buf , sizeof(pbm_create_ext_record_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_create_ext_record_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM create modify record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM create modify record start!"); /*lint !e26*/
#if 0 // cov M when zte_send_message is commented, ret_code!= OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM create modify record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM create modify record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm send create modify record fail"); /*lint !e26*/
@@ -386,11 +386,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_del_one_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_del_one_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -399,17 +399,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_del_multi_records_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_del_multi_records_s_type is more than the msg buf , sizeof(zte_pbm_del_multi_records_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_del_multi_records_s_type is more than the msg buf , sizeof(pbm_del_multi_records_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_del_multi_records_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM del one record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM del one record start!"); /*lint !e26*/
#if 0 // cov M when zte_send_message is commented, ret_code!= OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM del one record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM del one record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm del one record msg fail"); /*lint !e26*/
@@ -438,11 +438,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_del_multi_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_del_multi_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -451,7 +451,7 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_del_multi_records_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_del_multi_records_s_type is more than the msg buf , sizeof(zte_pbm_del_multi_records_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_del_multi_records_s_type is more than the msg buf , sizeof(pbm_del_multi_records_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
@@ -459,10 +459,10 @@
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_del_multi_records_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM del multi record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM del multi record start!"); /*lint !e26*/
#if 0 // cov M when zte_send_message is commented, ret_code!= OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM del multi record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM del multi record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm del multi record msg fail"); /*lint !e26*/
@@ -492,11 +492,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_del_all_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_del_all_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_del_all_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_del_all_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -505,7 +505,7 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_del_multi_records_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_del_multi_records_s_type is more than the msg buf , sizeof(zte_pbm_del_multi_records_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_del_multi_records_s_type is more than the msg buf , sizeof(pbm_del_multi_records_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
@@ -513,10 +513,10 @@
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_del_multi_records_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM del all record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM del all record start!"); /*lint !e26*/
#if 0 // cov M // when zte_send_message is commented, ret_code != OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM del all record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM del all record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm del all record msg fail"); /*lint !e26*/