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

Merge pull request #1215 in FS/freeswitch from ~MOCHOUINARD/freeswitch:bugfix/FS-10112-patch-switch_xml-renaming-a-c-variable to master 

* commit '0147d4dbc18c8329b4fa7716653968b76a02ff16':
  FS-10112: switch_xml - Renaming a C variable name and type (No behavior change)
This commit is contained in:
Mike Jerris 2017-04-28 20:04:21 +00:00
parent 14204c2557 0147d4dbc1
commit 5a54356ada
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch_xml.c
View File

@ -1879,18 +1879,18 @@ static void do_merge(switch_xml_t in, switch_xml_t src, const char *container, c
const char *var = switch_xml_attr(param, "name");
const char *val = switch_xml_attr(param, "value");
int go = 1;
switch_bool_t add_child = SWITCH_TRUE;
for (iparam = switch_xml_child(itag, tag_name); iparam; iparam = iparam->next) {
const char *ivar = switch_xml_attr(iparam, "name");
if (var && ivar && !strcasecmp(var, ivar)) {
go = 0;
add_child = SWITCH_FALSE;
break;
}
}
if (go) {
if (add_child) {
iitag = switch_xml_add_child_d(itag, tag_name, 0);
switch_xml_set_attr_d(iitag, "name", var);
switch_xml_set_attr_d(iitag, "value", val);