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

Add switch_xml_parse_str_dynamic and switch_xml_parse_str_dup 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13255 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene 2009-05-07 21:40:21 +00:00
parent a7b0d40026
commit 3b168bcb3f
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/include/switch_xml.h
View File

@ -98,6 +98,21 @@ struct switch_xml {
uint32_t flags;
};
/*!
* \brief Parses a string into a switch_xml_t, ensuring the memory will be freed with switch_xml_free
* \param s The string to parse
* \param dup true if you want the string to be strdup()'d automatically
* \return the switch_xml_t or NULL if an error occured
*/
SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str_dynamic(char *s, switch_bool_t dup);
/*!
* \brief Parses a string into a switch_xml_t
* \param s The string to parse
* \return the switch_xml_t or NULL if an error occured
*/
#define switch_xml_parse_str_dup(x) switch_xml_parse_str_dynamic(x, SWITCH_TRUE)
///\brief Given a string of xml data and its length, parses it and creates an switch_xml
///\ structure. For efficiency, modifies the data by adding null terminators
///\ and decoding ampersand sequences. If you don't want this, copy the data and

22
src/switch_xml.c
View File

@ -902,6 +902,19 @@ static void switch_xml_free_attr(char **attr)
free(attr);
}
SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str_dynamic(char *s, switch_bool_t dup)
{
switch_xml_root_t root;
char *data = dup ? strdup(s) : s;
if ((root = (switch_xml_root_t) switch_xml_parse_str(data, strlen(data)))) {
root->dynamic = 1; /* Make sure we free the memory is switch_xml_free() */
return &root->xml;
} else {
return NULL;
}
}
/* parse the given xml string and return an switch_xml structure */
SWITCH_DECLARE(switch_xml_t) switch_xml_parse_str(char *s, switch_size_t len)
{
@ -1552,14 +1565,9 @@ 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 (clone) {
char *x;
switch_xml_root_t xmlroot = NULL;
x = switch_xml_toxml(tag, SWITCH_FALSE);
char *x = switch_xml_toxml(tag, SWITCH_FALSE);
switch_assert(x);
xmlroot = (switch_xml_root_t)switch_xml_parse_str(x, strlen(x));
xmlroot->dynamic = 1; /* free the memory in switch_xml_free */
*root = (switch_xml_t)xmlroot;
*node = *root;
*node = *root = switch_xml_parse_str_dynamic(x, SWITCH_FALSE); /* x will be free()'d in switch_xml_free() */
switch_xml_free(xml);
} else {
*node = tag;