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

Missed a few instances of __FUNCTION__ in clixon_debug*()

Browse source
This commit is contained in:
Philip Prindeville 2024-01-11 09:47:33 -07:00 • committed by Olof Hagsand
parent 9dbca0c562
commit b258fc625c
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/cli/cli_common.c
View file

@ -459,7 +459,7 @@ cli_dbxml(clixon_handle h,
goto done; goto done;
xbot = xtop; xbot = xtop;
if (api_path){ if (api_path){
clixon_debug(CLIXON_DBG_XPATH, "%s api_path:%s", __FUNCTION__, api_path); clixon_debug(CLIXON_DBG_XPATH, "api_path:%s", api_path);
if ((ret = api_path2xml(api_path, yspec0, xtop, YC_DATANODE, 1, &xbot, &y, &xerr)) < 0) if ((ret = api_path2xml(api_path, yspec0, xtop, YC_DATANODE, 1, &xbot, &y, &xerr)) < 0)
goto done; goto done;
if (ret == 0){ if (ret == 0){

4
apps/cli/cli_generate.c
View file

@ -1581,8 +1581,8 @@ yang2cli_grouping(clixon_handle h,
/* Add prefix: assume new are appended */ /* Add prefix: assume new are appended */
for (i=0; i<pt_len_get(pt); i++){ for (i=0; i<pt_len_get(pt); i++){
if ((co = pt_vec_i_get(pt, i)) != NULL){ if ((co = pt_vec_i_get(pt, i)) != NULL){
clixon_debug(CLIXON_DBG_CLIENT, "%s command: %s", clixon_debug(CLIXON_DBG_CLIENT, "command: %s",
__FUNCTION__, co->co_command); co->co_command);
co_prefix_set(co, prefix); co_prefix_set(co, prefix);
} }
} }

2
lib/src/clixon_datastore_read.c
View file

@ -866,7 +866,7 @@ xmldb_get_nocache(clixon_handle h,
xt = NULL; xt = NULL;
retval = 1; retval = 1;
done: done:
clixon_debug(CLIXON_DBG_DEFAULT | CLIXON_DBG_DETAIL, "%s retval:%d", __FUNCTION__, retval); clixon_debug(CLIXON_DBG_DEFAULT | CLIXON_DBG_DETAIL, "retval:%d", retval);
if (xt) if (xt)
xml_free(xt); xml_free(xt);
if (xvec) if (xvec)

10
lib/src/clixon_validate.c
View file

@ -1272,7 +1272,7 @@ xml_yang_validate_all(clixon_handle h,
} }
if (yang_config(yt) != 0){ if (yang_config(yt) != 0){
ret = yang_check_when_xpath(xt, xml_parent(xt), yt, &hit, &nr, &xpath); ret = yang_check_when_xpath(xt, xml_parent(xt), yt, &hit, &nr, &xpath);
clixon_debug(CLIXON_DBG_XPATH, "%s nr:%d xpath:%s return:%d", __FUNCTION__, nr, xpath, ret); clixon_debug(CLIXON_DBG_XPATH, "nr:%d xpath:%s return:%d", nr, xpath, ret);
if (ret < 0) if (ret < 0)
goto done; goto done;
@ -1338,20 +1338,20 @@ xml_yang_validate_all(clixon_handle h,
if (yang_keyword_get(yc) != Y_MUST) if (yang_keyword_get(yc) != Y_MUST)
continue; continue;
if (!saw_node) if (!saw_node)
clixon_debug_xml(CLIXON_DBG_XPATH, xt, "%s", __FUNCTION__); clixon_debug_xml(CLIXON_DBG_XPATH, xt, "");
saw_node = 1; saw_node = 1;
xpath = yang_argument_get(yc); /* "must" has xpath argument */ xpath = yang_argument_get(yc); /* "must" has xpath argument */
clixon_debug(CLIXON_DBG_XPATH, "%s xpath '%s'", __FUNCTION__, xpath); clixon_debug(CLIXON_DBG_XPATH, "xpath '%s'", xpath);
/* the context node is the node in the accessible tree for /* the context node is the node in the accessible tree for
* which the "must" statement is defined. * which the "must" statement is defined.
* The set of namespace declarations is the set of all "import" statements' * The set of namespace declarations is the set of all "import" statements'
*/ */
if (xml_nsctx_yang(yc, &nsc) < 0) if (xml_nsctx_yang(yc, &nsc) < 0)
goto done; goto done;
clixon_debug(CLIXON_DBG_XPATH, "%s namespace '%s'", __FUNCTION__, xml_nsctx_get(nsc, NULL)); clixon_debug(CLIXON_DBG_XPATH, "namespace '%s'", xml_nsctx_get(nsc, NULL));
nr = xpath_vec_bool(xt, nsc, "%s", xpath); nr = xpath_vec_bool(xt, nsc, "%s", xpath);
clixon_debug(CLIXON_DBG_XPATH, "%s result %s", __FUNCTION__, (nr < 0 ? "error" : (nr != 0 ? "true" : "false"))); clixon_debug(CLIXON_DBG_XPATH, "result %s", (nr < 0 ? "error" : (nr != 0 ? "true" : "false")));
if (nr < 0) if (nr < 0)
goto done; goto done;
if (!nr){ if (!nr){