[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/goahead/interface5.0/zte_web_rest.c b/ap/app/goahead/interface5.0/zte_web_rest.c
index 95b1f8f..44455c1 100644
--- a/ap/app/goahead/interface5.0/zte_web_rest.c
+++ b/ap/app/goahead/interface5.0/zte_web_rest.c
@@ -45,22 +45,22 @@
char_t *action = NULL;
char_t *zte_goform_id = NULL;
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler>>wp->path]:%s\n", wp->query); /*lint !e26 !e1013*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler>>wp->path]:%s\n", wp->query); /*lint !e26 !e1013*/
zte_goform_id = websGetVar(wp, T("goformId"), T(""));
action = websGetVar(wp, T("action_process"), T(""));
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler>>test websGetVar]:%s\n", zte_goform_id); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler>>action]:%s\n", action); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler>>test websGetVar]:%s\n", zte_goform_id); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler>>action]:%s\n", action); /*lint !e26*/
if (0 == strcmp(action, "get")) {
zte_goform_get_cmd_process(wp,T(""),T("")); /*lint !e1013*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler]:get action end\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler]:get action end\n"); /*lint !e26*/
return;
} else if (0 == strcmp(action, "set")) {
zte_goform_set_cmd_process(wp,T(""),T(""));/*lint !e1013*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler]:set action end\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler]:set action end\n"); /*lint !e26*/
return;
} else {
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler]:Can not find action\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler]:Can not find action\n"); /*lint !e26*/
return;
}
@@ -80,17 +80,17 @@
xml = & (root->xml);
if(xml == NULL)
return;
- //slog(MISC_PRINT,SLOG_DEBUG,"[zte_change_wp_query_new]:xml->name:%s",xml->name);/*lint !e26*/
+ //slog(MISC_PRINT,SLOG_DEBUG,"[change_wp_query_new]:xml->name:%s",xml->name);/*lint !e26*/
action_tag = xml->child;
if (! action_tag) {
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_change_wp_query_new]:action_tag is NULL or the xml_str is not full!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[change_wp_query_new]:action_tag is NULL or the xml_str is not full!"); /*lint !e26*/
//zte_write_result_to_web(wp,"action_tag is NULL!");
return;
} else {
while (action_tag) {
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_change_wp_query_new]:name:%s", action_tag->name); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_change_wp_query_new]:text:%s", action_tag->txt); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[change_wp_query_new]:name:%s", action_tag->name); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[change_wp_query_new]:text:%s", action_tag->txt); /*lint !e26*/
websSetVar(wp, action_tag->name, action_tag->txt);
action_tag = action_tag->sibling;
}
@@ -341,7 +341,7 @@
void zte_rest_get_sms_data(webs_t wp, zte_sms_query_result *p_sms_query_result, int i, int tag)
{
if (wp->flags & WEBS_XML_CLIENT_REQUEST) {
- slog(MISC_PRINT, SLOG_DEBUG, "zte_rest_get_sms_data WEBS_XML_CLIENT_REQUEST");
+ slog(MISC_PRINT, SLOG_DEBUG, "rest_get_sms_data WEBS_XML_CLIENT_REQUEST");
char *tmp_num = NULL;
char pbm_name[100] = {0};
int len = 0;