From cb58b2bb12cc54035058e791319bb1290750cb48 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Sun, 26 Jul 2020 16:16:32 +0200 Subject: [PATCH] log warning, error doc --- lib/clixon/clixon_err.h | 8 ++++---- lib/src/clixon_err.c | 2 +- lib/src/clixon_validate.c | 1 + test/test_xpath.sh | 3 +++ util/clixon_util_path.c | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/clixon/clixon_err.h b/lib/clixon/clixon_err.h index 4e58eeb7..2ef1c4c9 100644 --- a/lib/clixon/clixon_err.h +++ b/lib/clixon/clixon_err.h @@ -92,14 +92,14 @@ extern char clicon_err_reason[ERR_STRLEN]; /* * Prototypes */ -int clicon_err_reset(void); +int clicon_err_reset(void); #if defined(__GNUC__) && __GNUC__ >= 3 -int clicon_err_fn(const char *fn, const int line, int category, int err, const char *format, ...) __attribute__ ((format (printf, 5, 6))); +int clicon_err_fn(const char *fn, const int line, int category, int err, const char *format, ...) __attribute__ ((format (printf, 5, 6))); #else -int clicon_err_fn(const char *fn, const int line, int category, int err, const char *format, ...); +int clicon_err_fn(const char *fn, const int line, int category, int err, const char *format, ...); #endif char *clicon_strerror(int err); void *clicon_err_save(void); -int clicon_err_restore(void *handle); +int clicon_err_restore(void *handle); #endif /* _CLIXON_ERR_H_ */ diff --git a/lib/src/clixon_err.c b/lib/src/clixon_err.c index d0901900..85b8646d 100644 --- a/lib/src/clixon_err.c +++ b/lib/src/clixon_err.c @@ -143,7 +143,7 @@ clicon_err_reset(void) * @param[in] category Clixon error category, See enum clicon_err * @param[in] suberr Error number, typically errno * @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, const int line, diff --git a/lib/src/clixon_validate.c b/lib/src/clixon_validate.c index 23f52426..e3d652e8 100644 --- a/lib/src/clixon_validate.c +++ b/lib/src/clixon_validate.c @@ -66,6 +66,7 @@ #include "clixon_handle.h" #include "clixon_string.h" #include "clixon_err.h" +#include "clixon_log.h" #include "clixon_yang.h" #include "clixon_xml.h" #include "clixon_netconf_lib.h" diff --git a/test/test_xpath.sh b/test/test_xpath.sh index f2bbbcfe..f0b64378 100755 --- a/test/test_xpath.sh +++ b/test/test_xpath.sh @@ -186,6 +186,9 @@ new "Multiple entries" new "xpath bbb[ccc='foo']" expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc='foo']" 0 "" "^nodeset:0:foo42bar1:99foo$" +new "xpath bbb[ccc=\"foo\"]" +expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc=\"foo\"]" 0 "" "^nodeset:0:foo42bar1:99foo$" + new "xpath bbb[ccc='42']" expecteof "$clixon_util_xpath -f $xml3 -p bbb[ccc='42']" 0 "" "^nodeset:0:foo42bar$" diff --git a/util/clixon_util_path.c b/util/clixon_util_path.c index 2250ab79..32d6b9c1 100644 --- a/util/clixon_util_path.c +++ b/util/clixon_util_path.c @@ -259,7 +259,7 @@ main(int argc, } } - /* Repeat for profiling (default is nr = 1) */ + /* Repeat for performance profiling (default is nr = 1) */ xvec = NULL; for (i=0; i