From b258fc625c7429b4a65f032116bd0d14ff59444d Mon Sep 17 00:00:00 2001
From: Philip Prindeville <pprindeville@netgate.com>
Date: Thu, 11 Jan 2024 09:47:33 -0700
Subject: [PATCH] Missed a few instances of __FUNCTION__ in clixon_debug*()

---
 apps/cli/cli_common.c           |  2 +-
 apps/cli/cli_generate.c         |  4 ++--
 lib/src/clixon_datastore_read.c |  2 +-
 lib/src/clixon_validate.c       | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index f246211b..e31628e9 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -459,7 +459,7 @@ cli_dbxml(clixon_handle       h,
         goto done;
     xbot = xtop;
     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)
             goto done;
         if (ret == 0){
diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c
index 30c2d297..1a665fcb 100644
--- a/apps/cli/cli_generate.c
+++ b/apps/cli/cli_generate.c
@@ -1581,8 +1581,8 @@ yang2cli_grouping(clixon_handle      h,
     /* Add prefix: assume new are appended */
     for (i=0; i<pt_len_get(pt); i++){
         if ((co = pt_vec_i_get(pt, i)) != NULL){
-            clixon_debug(CLIXON_DBG_CLIENT, "%s command: %s",
-                         __FUNCTION__, co->co_command);
+            clixon_debug(CLIXON_DBG_CLIENT, "command: %s",
+                         co->co_command);
             co_prefix_set(co, prefix);
         }
     }
diff --git a/lib/src/clixon_datastore_read.c b/lib/src/clixon_datastore_read.c
index b64866cb..0b092c5a 100644
--- a/lib/src/clixon_datastore_read.c
+++ b/lib/src/clixon_datastore_read.c
@@ -866,7 +866,7 @@ xmldb_get_nocache(clixon_handle    h,
     xt = NULL;
     retval = 1;
  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)
         xml_free(xt);
     if (xvec)
diff --git a/lib/src/clixon_validate.c b/lib/src/clixon_validate.c
index c190287e..4116558f 100644
--- a/lib/src/clixon_validate.c
+++ b/lib/src/clixon_validate.c
@@ -1272,7 +1272,7 @@ xml_yang_validate_all(clixon_handle h,
     }
     if (yang_config(yt) != 0){
         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)
             goto done;
 
@@ -1338,20 +1338,20 @@ xml_yang_validate_all(clixon_handle h,
             if (yang_keyword_get(yc) != Y_MUST)
                 continue;
             if (!saw_node)
-                clixon_debug_xml(CLIXON_DBG_XPATH, xt, "%s", __FUNCTION__);
+                clixon_debug_xml(CLIXON_DBG_XPATH, xt, "");
             saw_node = 1;
 
             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
              * which the "must" statement is defined. 
              * The set of namespace declarations is the set of all "import" statements' 
              */
             if (xml_nsctx_yang(yc, &nsc) < 0)
                 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);
-            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)
                 goto done;
             if (!nr){