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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Olof hagsand 2017-09-27 18:22:11 +02:00
commit c74cdda1e8
6 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/cli/cli_common.c
View file

@ -538,10 +538,8 @@ cli_commit(clicon_handle h,
{
int retval = -1;
if ((retval = clicon_rpc_commit(h)) < 0){ /* startup */
cli_output(stderr, "Commit failed. Edit and try again or discard changes");
if ((retval = clicon_rpc_commit(h)) < 0)
goto done;
}
retval = 0;
done:
return retval;
@ -659,13 +657,13 @@ compare_dbs(clicon_handle h,
if (clicon_rpc_get_config(h, "running", "/", &xc1) < 0)
goto done;
if ((xerr = xpath_first(xc1, "/rpc-error")) != NULL){
clicon_rpc_generate_error(xerr);
clicon_rpc_generate_error("Get configuration", xerr);
goto done;
}
if (clicon_rpc_get_config(h, "candidate", "/", &xc2) < 0)
goto done;
if ((xerr = xpath_first(xc2, "/rpc-error")) != NULL){
clicon_rpc_generate_error(xerr);
clicon_rpc_generate_error("Get configuration", xerr);
goto done;
}
if (compare_xmls(xc1, xc2, astext) < 0) /* astext? */
@ -836,7 +834,7 @@ save_config_file(clicon_handle h,
if (clicon_rpc_get_config(h, dbstr,"/", &xt) < 0)
goto done;
if ((xerr = xpath_first(xt, "/rpc-error")) != NULL){
clicon_rpc_generate_error(xerr);
clicon_rpc_generate_error("Get configuration", xerr);
goto done;
}
if ((f = fopen(filename, "wb")) == NULL){
@ -1180,7 +1178,7 @@ cli_copy_config(clicon_handle h,
if (clicon_rpc_get_config(h, db, cbuf_get(cb), &x1) < 0)
goto done;
if ((xerr = xpath_first(x1, "/rpc-error")) != NULL){
clicon_rpc_generate_error(xerr);
clicon_rpc_generate_error("Get configuration", xerr);
goto done;
}

1
apps/cli/cli_plugin.c
View file

@ -568,7 +568,6 @@ cli_handler_err(FILE *f)
if (clicon_suberrno)
cli_output(f, ": %s", strerror(clicon_suberrno));
cli_output(f, "\n");
}
else
cli_output(f, "CLI command error\n");

6
apps/cli/cli_show.c
View file

@ -156,7 +156,7 @@ expand_dbvar(void *h,
if (clicon_rpc_get_config(h, dbstr, "/", &xt) < 0)
goto done;
if ((xerr = xpath_first(xt, "/rpc-error")) != NULL){
clicon_rpc_generate_error(xerr);
clicon_rpc_generate_error("Get configuration", xerr);
goto done;
}
xcur = xt; /* default top-of-tree */
@ -481,7 +481,7 @@ cli_show_config(clicon_handle h,
if (clicon_rpc_get_config(h, db, cbuf_get(cbxpath), &xt) < 0)
goto done;
if ((xerr = xpath_first(xt, "/rpc-error")) != NULL){
clicon_rpc_generate_error(xerr);
clicon_rpc_generate_error("Get configuration", xerr);
goto done;
}
/* Print configuration according to format */
@ -565,7 +565,7 @@ show_conf_xpath(clicon_handle h,
if (clicon_rpc_get_config(h, str, xpath, &xt) < 0)
goto done;
if ((xerr = xpath_first(xt, "/rpc-error")) != NULL){
clicon_rpc_generate_error(xerr);
clicon_rpc_generate_error("Get configuration", xerr);
goto done;
}
if (xpath_vec(xt, xpath, &xv, &xlen) < 0)