added merge of json trees
This commit is contained in:
parent
20a677cb6c
commit
353f2e6038
1 changed files with 3 additions and 2 deletions
|
|
@ -691,8 +691,9 @@ int
|
||||||
json_parse_str(char *str,
|
json_parse_str(char *str,
|
||||||
cxobj **xt)
|
cxobj **xt)
|
||||||
{
|
{
|
||||||
if ((*xt = xml_new("top", NULL, NULL)) == NULL)
|
if (*xt == NULL)
|
||||||
return -1;
|
if ((*xt = xml_new("top", NULL, NULL)) == NULL)
|
||||||
|
return -1;
|
||||||
return json_parse(str, "", *xt);
|
return json_parse(str, "", *xt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue