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

comments and typos

Browse source
This commit is contained in:
Olof hagsand 2020-09-22 22:41:59 +02:00
parent c616aa1569
commit 2994d2f9a9
3 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/backend/backend_plugin.c
View file

@ -166,13 +166,24 @@ clixon_plugin_daemon_all(clicon_handle h)
}
/*! Call single backend statedata callback
*
* Create an xml state tree (xret) for one callback only on the form:
* <config>...</config>,
* call a user supplied function (ca_statedata) which can do two things:
* - Fill in state XML in the tree and return 0
* - Call cli_error() and return -1
* In the former case, this function returns the state XML tree to the caller (which
* typically merges the tree with other state trees).
* In the latter error case, this function returns 0 (invalid) to the caller with no tree
* If a fatal error occurs in this function, -1 is returned.
*
* @param[in] cp Plugin handle
* @param[in] h clicon handle
* @param[in] xpath String with XPATH syntax. or NULL for all
* @retval -1 Error
* @retval 0 Statedata callback failed
* @retval 1 OK if callback found (and called) xp is set, otherwise xp is not set
* @note xtop can be replaced
* @param[out] xret If retval=1, state tree created and returned: <config>...
* @retval -1 Fatal error
* @retval 0 Statedata callback failed. no XML tree returned
* @retval 1 OK if callback found (and called) xret is set
*/
static int
clixon_plugin_statedata_one(clixon_plugin *cp,
@ -194,6 +205,7 @@ clixon_plugin_statedata_one(clixon_plugin *cp,
__FUNCTION__, cp->cp_name);
goto fail; /* Dont quit here on user callbacks */
}
}
if (xp && x)
*xp = x;
@ -212,11 +224,11 @@ clixon_plugin_statedata_one(clixon_plugin *cp,
* @param[in] yspec Yang spec
* @param[in] nsc Namespace context
* @param[in] xpath String with XPATH syntax. or NULL for all
* @param[in,out] xtop State XML tree is merged with existing tree.
* @param[in,out] xret State XML tree is merged with existing tree.
* @retval -1 Error
* @retval 0 Statedata callback failed (xret set with netconf-error)
* @retval 1 OK
* @note xtop can be replaced
* @note xret can be replaced in this function
*/
int
clixon_plugin_statedata_all(clicon_handle h,

2
lib/src/clixon_xpath.c
View file

@ -210,7 +210,7 @@ xpath_tree_print_cb(cbuf *cb,
* @see xpath_tree2str
*/
int
xpath_tree_print(FILE *f,
xpath_tree_print(FILE *f,
xpath_tree *xs)
{
int retval = -1;

3
lib/src/clixon_xpath_eval.h
View file

@ -2,7 +2,8 @@
*
***** BEGIN LICENSE BLOCK *****
Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
Copyright (C) 2009-2019 Olof Hagsandc
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
This file is part of CLIXON.