[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/goahead/interface5.0/zte_web_ussd.c b/ap/app/goahead/interface5.0/zte_web_ussd.c
index e65ab24..215adc1 100644
--- a/ap/app/goahead/interface5.0/zte_web_ussd.c
+++ b/ap/app/goahead/interface5.0/zte_web_ussd.c
@@ -61,7 +61,7 @@
char_t *ussd_operator = NULL;
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd-> invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd-> invalid input..\n"); /*lint !e26*/
return;
}
@@ -100,7 +100,7 @@
unsigned char *ussd_send_number = NULL;
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_send: invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_send: invalid input..\n"); /*lint !e26*/
return;
}
@@ -123,9 +123,9 @@
/*handler to mc*/
if (0 == ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_USSD_SET_REQ, 0, NULL, 0)) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_ussd_send: successful.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_ussd_send: successful.\n"); /*lint !e26*/
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_send: failed.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_send: failed.\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
@@ -145,7 +145,7 @@
{
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_cancel invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_cancel invalid input..\n"); /*lint !e26*/
return;
}
@@ -155,9 +155,9 @@
/*handler to mc*/
if (0 == ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_USSD_CANCEL_REQ, 0, NULL, 0)) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_ussd_cancel: zte_topsw_mc_ussd_send successful.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_ussd_cancel: topsw_mc_ussd_send successful.\n"); /*lint !e26*/
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_cancel: zte_topsw_mc_ussd_send failed.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_cancel: topsw_mc_ussd_send failed.\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
@@ -177,7 +177,7 @@
{
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_over invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_over invalid input..\n"); /*lint !e26*/
return;
}
@@ -202,7 +202,7 @@
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_reply: invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_reply: invalid input..\n"); /*lint !e26*/
return;
}
@@ -216,9 +216,9 @@
(void)zte_web_write("ussd_operater", "send");
if (0 == ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_USSD_SET_REQ, 0, NULL, 0)) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_ussd_reply: successful.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_ussd_reply: successful.\n"); /*lint !e26*/
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_reply: failed.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_reply: failed.\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
}
@@ -237,10 +237,10 @@
void zte_web_ussd(webs_t wp)
{
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd: invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd: invalid input..\n"); /*lint !e26*/
return;
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_ussd: ok\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_ussd: ok\n"); /*lint !e26*/
(void)zte_web_write(ZTE_USSD_NV, USSD_FIRST_CANCEL);
zte_write_result_to_web(wp, SUCCESS);
@@ -290,7 +290,7 @@
result = zte_ussd_get_to_web_data(&ussd_data_info);
#if 0 // kw 3 return -1 branch is unreachable
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_ussd_get_to_web_data fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call ussd_get_to_web_data fail.\n"); /*lint !e26*/
web_feedback_header(wp);
(void)websWrite(wp, T("[]"));
return ;