experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better json printing

Browse source
This commit is contained in:
Olof hagsand 2016-09-22 16:57:26 +02:00
parent fe91ba707d
commit b82a8bae26
5 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/cli/cli_common.c
View file

@ -835,7 +835,7 @@ cli_notification_cb(int s, void *arg)
if (clicon_xml_parse_string(&eventstr, &xt) < 0)
goto done;
if ((xn = xml_child_i(xt, 0)) != NULL){
if (xml2json(stdout, xn, 0) < 0)
if (xml2json(stdout, xn, 0, 1) < 0)
goto done;
}
}

4
apps/cli/cli_show.c
View file

@ -439,13 +439,11 @@ show_conf_as_json(clicon_handle h,
cg_var *arg)
{
cxobj *xt = NULL;
cxobj *xc;
int retval = -1;
if (show_conf_as(h, cvv, arg, &xt) < 0)
goto done;
xc = NULL; /* Dont print xt itself */
xml2json(stdout, xt, 1);
xml2json(stdout, xt, 1, 0);
retval = 0;
done:
if (xt)