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

FSCORE-309 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12270 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-02-25 02:22:07 +00:00
parent 3a85348cdf
commit 4a520847c2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/switch_xml.c
View File

@ -1554,9 +1554,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section,
if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) {
if (clone) { if (clone) {
char *x; char *x;
switch_mutex_lock(XML_GEN_LOCK);
x = switch_xml_toxml(tag, SWITCH_FALSE); x = switch_xml_toxml(tag, SWITCH_FALSE);
switch_mutex_unlock(XML_GEN_LOCK);
switch_assert(x); switch_assert(x);
*root = switch_xml_parse_str(x, strlen(x)); *root = switch_xml_parse_str(x, strlen(x));
*node = *root; *node = *root;
@ -2112,9 +2110,12 @@ static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len,
SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml, switch_bool_t prn_header) SWITCH_DECLARE(char *) switch_xml_toxml(switch_xml_t xml, switch_bool_t prn_header)
{ {
char *s; char *r, *s;
switch_mutex_lock(XML_GEN_LOCK);
s = (char *)malloc(SWITCH_XML_BUFSIZE); s = (char *)malloc(SWITCH_XML_BUFSIZE);
return switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header); r = switch_xml_toxml_buf(xml, s, SWITCH_XML_BUFSIZE, 0, prn_header);
switch_mutex_unlock(XML_GEN_LOCK);
return r;
} }
// converts an switch_xml structure back to xml, returning a string of xml date that // converts an switch_xml structure back to xml, returning a string of xml date that