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

CLIgen pt_expand API change and mem problems

Browse source
This commit is contained in:
Olof hagsand 2020-05-20 12:00:52 +02:00
parent 7d0b245174
commit 1a1aa58249
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,6 +17,6 @@ See [LICENSE.md](LICENSE.md) for the license.
Clixon interaction is best done posting issues, pull requests, or joining the Clixon interaction is best done posting issues, pull requests, or joining the
[slack channel](https://clixondev.slack.com). [slack channel](https://clixondev.slack.com).
[Slack invite](https://join.slack.com/t/clixondev/shared_invite/enQtMzI3OTM4MzA3Nzk3LTA3NWM4OWYwYWMxZDhiYTNhNjRkNjQ1NWI1Zjk5M2JjMDk4MTUzMTljYTZiYmNhODkwMDI2ZTkyNWU3ZWMyN2U). [Slack invite](https://join.slack.com/t/clixondev/shared_invite/zt-egqe8bqt-JSQL49otf2B9MzKSoUoRQg).
Clixon is sponsored by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/) Clixon is sponsored by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/)

1
apps/backend/backend_main.c
View file

@ -428,7 +428,6 @@ usage(clicon_handle h,
exit(-1); exit(-1);
} }
int int
main(int argc, main(int argc,
char **argv) char **argv)

4
apps/cli/cli_plugin.c
View file

@ -577,7 +577,7 @@ clicon_parse(clicon_handle h,
if (cliread_parse(cli_cligen(h), cmd, pt, &match_obj, cvv, result, &reason) < 0) if (cliread_parse(cli_cligen(h), cmd, pt, &match_obj, cvv, result, &reason) < 0)
goto done; goto done;
if (*result != CG_MATCH) if (*result != CG_MATCH)
pt_expand_cleanup_1(pt); /* XXX change to pt_expand_treeref_cleanup */ pt_expand_cleanup(pt); /* XXX change to pt_expand_treeref_cleanup */
if (modename0){ if (modename0){
cligen_tree_active_set(cli_cligen(h), modename0); cligen_tree_active_set(cli_cligen(h), modename0);
modename0 = NULL; modename0 = NULL;
@ -597,7 +597,7 @@ clicon_parse(clicon_handle h,
} }
if ((r = clicon_eval(h, cmd, match_obj, cvv)) < 0) if ((r = clicon_eval(h, cmd, match_obj, cvv)) < 0)
cli_handler_err(stdout); cli_handler_err(stdout);
pt_expand_cleanup_1(pt); /* XXX change to pt_expand_treeref_cleanup */ pt_expand_cleanup(pt); /* XXX change to pt_expand_treeref_cleanup */
if (evalres) if (evalres)
*evalres = r; *evalres = r;
break; break;