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

Adapt to CLIgen refactoring of tree expansion code

Browse source
This commit is contained in:
Olof hagsand 2023-07-02 13:56:18 +02:00
parent ca697c9a36
commit e498e09570
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/cli/cli_plugin.c
View file

@ -491,7 +491,6 @@ clicon_parse(clicon_handle h,
parse_tree *pt; /* Orig */ parse_tree *pt; /* Orig */
cg_obj *match_obj = NULL; cg_obj *match_obj = NULL;
cvec *cvv = NULL; cvec *cvv = NULL;
cg_callback *callbacks = NULL;
FILE *f; FILE *f;
char *reason = NULL; char *reason = NULL;
cligen_handle ch; cligen_handle ch;
@ -513,7 +512,7 @@ clicon_parse(clicon_handle h,
fprintf(f, "No such parse-tree registered: %s\n", modename); fprintf(f, "No such parse-tree registered: %s\n", modename);
goto done; goto done;
} }
if (cliread_parse(ch, cmd, pt, &match_obj, &cvv, &callbacks, result, &reason) < 0) if (cliread_parse(ch, cmd, pt, &match_obj, &cvv, result, &reason) < 0)
goto done; goto done;
/* Debug command and result code */ /* Debug command and result code */
clicon_debug(1, "%s result:%d command: \"%s\"", __FUNCTION__, *result, cmd); clicon_debug(1, "%s result:%d command: \"%s\"", __FUNCTION__, *result, cmd);
@ -533,7 +532,7 @@ clicon_parse(clicon_handle h,
cli_output_reset(); cli_output_reset();
if (!cligen_exiting(ch)) { if (!cligen_exiting(ch)) {
clicon_err_reset(); clicon_err_reset();
if ((ret = cligen_eval(ch, match_obj, cvv, callbacks)) < 0) { if ((ret = cligen_eval(ch, match_obj, cvv)) < 0) {
cli_handler_err(stdout); cli_handler_err(stdout);
if (clicon_suberrno == ESHUTDOWN) if (clicon_suberrno == ESHUTDOWN)
goto done; goto done;
@ -556,9 +555,6 @@ clicon_parse(clicon_handle h,
retval = 0; retval = 0;
done: done:
fflush(f); fflush(f);
if (callbacks)
co_callbacks_free(&callbacks);
if (reason) if (reason)
free(reason); free(reason);
if (cvv) if (cvv)