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

log warning, error doc

Browse source
This commit is contained in:
Olof hagsand 2020-07-26 16:16:32 +02:00
parent 864e2d1692
commit cb58b2bb12
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/clixon_err.c
View file

@ -143,7 +143,7 @@ clicon_err_reset(void)
* @param[in] category Clixon error category, See enum clicon_err * @param[in] category Clixon error category, See enum clicon_err
* @param[in] suberr Error number, typically errno * @param[in] suberr Error number, typically errno
* @param[in] reason Error string, format with argv * @param[in] reason Error string, format with argv
* @see clicon_err_reser Resetting the global error variables. * @see clicon_err_reset Reset the global error variables.
*/ */
int clicon_err_fn(const char *fn, int clicon_err_fn(const char *fn,
const int line, const int line,

1
lib/src/clixon_validate.c
View file

@ -66,6 +66,7 @@
#include "clixon_handle.h" #include "clixon_handle.h"
#include "clixon_string.h" #include "clixon_string.h"
#include "clixon_err.h" #include "clixon_err.h"
#include "clixon_log.h"
#include "clixon_yang.h" #include "clixon_yang.h"
#include "clixon_xml.h" #include "clixon_xml.h"
#include "clixon_netconf_lib.h" #include "clixon_netconf_lib.h"

3
test/test_xpath.sh
View file

@ -186,6 +186,9 @@ new "Multiple entries"
new "xpath bbb[ccc='foo']" new "xpath bbb[ccc='foo']"
expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc='foo']" 0 "" "^nodeset:0:<bbb x=\"hello\"><ccc>foo</ccc><ccc>42</ccc><ccc>bar</ccc></bbb>1:<bbb x=\"bye\"><ccc>99</ccc><ccc>foo</ccc></bbb>$" expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc='foo']" 0 "" "^nodeset:0:<bbb x=\"hello\"><ccc>foo</ccc><ccc>42</ccc><ccc>bar</ccc></bbb>1:<bbb x=\"bye\"><ccc>99</ccc><ccc>foo</ccc></bbb>$"
new "xpath bbb[ccc=\"foo\"]"
expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc=\"foo\"]" 0 "" "^nodeset:0:<bbb x=\"hello\"><ccc>foo</ccc><ccc>42</ccc><ccc>bar</ccc></bbb>1:<bbb x=\"bye\"><ccc>99</ccc><ccc>foo</ccc></bbb>$"
new "xpath bbb[ccc='42']" new "xpath bbb[ccc='42']"
expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc='42']" 0 "" "^nodeset:0:<bbb x=\"hello\"><ccc>foo</ccc><ccc>42</ccc><ccc>bar</ccc></bbb>$" expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc='42']" 0 "" "^nodeset:0:<bbb x=\"hello\"><ccc>foo</ccc><ccc>42</ccc><ccc>bar</ccc></bbb>$"

4
util/clixon_util_path.c
View file

@ -259,7 +259,7 @@ main(int argc,
} }
} }
/* Repeat for profiling (default is nr = 1) */ /* Repeat for performance profiling (default is nr = 1) */
xvec = NULL; xvec = NULL;
for (i=0; i<nr; i++){ for (i=0; i<nr; i++){
if (api_path_p){ if (api_path_p){
@ -271,7 +271,7 @@ main(int argc,
goto done; goto done;
} }
if (ret == 0){ if (ret == 0){
fprintf(stderr, "Fail\n"); fprintf(stderr, "Fail %d %s\n", clicon_errno, clicon_err_reason);
goto done; goto done;
} }
} }