kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix xml code to dup the values instead of store direct pointers (scope issue) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12692 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-03-20 20:41:30 +00:00
parent 3aacae1aa3
commit 5b6b9f89ab
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/applications/mod_commands/mod_commands.c
View File

@ -2421,7 +2421,7 @@ static int show_as_xml_callback(void *pArg, int argc, char **argv, char **column
switch_snprintf(id, sizeof(id), "%d", holder->rows); switch_snprintf(id, sizeof(id), "%d", holder->rows);
switch_xml_set_attr(switch_xml_set_flag(row, SWITCH_XML_DUP), strdup("row_id"), strdup(id)); switch_xml_set_attr_d(holder->xml, "row_id", id);
for (x = 0; x < argc; x++) { for (x = 0; x < argc; x++) {
char *name = columnNames[x]; char *name = columnNames[x];
@ -2687,7 +2687,7 @@ SWITCH_STANDARD_API(show_function)
char *xmlstr; char *xmlstr;
switch_snprintf(count, sizeof(count), "%d", holder.count); switch_snprintf(count, sizeof(count), "%d", holder.count);
switch_xml_set_attr(switch_xml_set_flag(holder.xml, SWITCH_XML_DUP), strdup("row_count"), strdup(count)); switch_xml_set_attr_d(holder.xml, "row_count", count);
xmlstr = switch_xml_toxml(holder.xml, SWITCH_FALSE); xmlstr = switch_xml_toxml(holder.xml, SWITCH_FALSE);
if (xmlstr) { if (xmlstr) {

26
src/switch_ivr.c
View File

@ -1634,67 +1634,67 @@ SWITCH_DECLARE(int) switch_ivr_set_xml_profile_data(switch_xml_t xml, switch_cal
if (!(param = switch_xml_add_child_d(xml, "username", off++))) { if (!(param = switch_xml_add_child_d(xml, "username", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->username); switch_xml_set_txt_d(param, caller_profile->username);
if (!(param = switch_xml_add_child_d(xml, "dialplan", off++))) { if (!(param = switch_xml_add_child_d(xml, "dialplan", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->dialplan); switch_xml_set_txt_d(param, caller_profile->dialplan);
if (!(param = switch_xml_add_child_d(xml, "caller_id_name", off++))) { if (!(param = switch_xml_add_child_d(xml, "caller_id_name", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->caller_id_name); switch_xml_set_txt_d(param, caller_profile->caller_id_name);
if (!(param = switch_xml_add_child_d(xml, "ani", off++))) { if (!(param = switch_xml_add_child_d(xml, "ani", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->ani); switch_xml_set_txt_d(param, caller_profile->ani);
if (!(param = switch_xml_add_child_d(xml, "aniii", off++))) { if (!(param = switch_xml_add_child_d(xml, "aniii", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->aniii); switch_xml_set_txt_d(param, caller_profile->aniii);
if (!(param = switch_xml_add_child_d(xml, "caller_id_number", off++))) { if (!(param = switch_xml_add_child_d(xml, "caller_id_number", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->caller_id_number); switch_xml_set_txt_d(param, caller_profile->caller_id_number);
if (!(param = switch_xml_add_child_d(xml, "network_addr", off++))) { if (!(param = switch_xml_add_child_d(xml, "network_addr", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->network_addr); switch_xml_set_txt_d(param, caller_profile->network_addr);
if (!(param = switch_xml_add_child_d(xml, "rdnis", off++))) { if (!(param = switch_xml_add_child_d(xml, "rdnis", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->rdnis); switch_xml_set_txt_d(param, caller_profile->rdnis);
if (!(param = switch_xml_add_child_d(xml, "destination_number", off++))) { if (!(param = switch_xml_add_child_d(xml, "destination_number", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->destination_number); switch_xml_set_txt_d(param, caller_profile->destination_number);
if (!(param = switch_xml_add_child_d(xml, "uuid", off++))) { if (!(param = switch_xml_add_child_d(xml, "uuid", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->uuid); switch_xml_set_txt_d(param, caller_profile->uuid);
if (!(param = switch_xml_add_child_d(xml, "source", off++))) { if (!(param = switch_xml_add_child_d(xml, "source", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->source); switch_xml_set_txt_d(param, caller_profile->source);
if (!(param = switch_xml_add_child_d(xml, "context", off++))) { if (!(param = switch_xml_add_child_d(xml, "context", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->context); switch_xml_set_txt_d(param, caller_profile->context);
if (!(param = switch_xml_add_child_d(xml, "chan_name", off++))) { if (!(param = switch_xml_add_child_d(xml, "chan_name", off++))) {
return -1; return -1;
} }
switch_xml_set_txt(param, caller_profile->chan_name); switch_xml_set_txt_d(param, caller_profile->chan_name);
return off; return off;
} }