From 11e28eedecbe89d327a061ad7cddbcd1009f3e61 Mon Sep 17 00:00:00 2001
From: Philip Prindeville <pprindeville@netgate.com>
Date: Thu, 4 Jan 2024 11:42:26 -0700
Subject: [PATCH] Discriminate XML debugging

---
 lib/src/clixon_path.c          | 4 ++--
 lib/src/clixon_xml_changelog.c | 4 ++--
 lib/src/clixon_xml_default.c   | 2 +-
 lib/src/clixon_xml_io.c        | 2 +-
 lib/src/clixon_xml_map.c       | 4 ++--
 lib/src/clixon_xml_sort.c      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/src/clixon_path.c b/lib/src/clixon_path.c
index 447a07bf..0d3c570f 100644
--- a/lib/src/clixon_path.c
+++ b/lib/src/clixon_path.c
@@ -1183,7 +1183,7 @@ api_path2xml_vec(char      **vec,
  ok:
     retval = 1; /* OK */
  done:
-    clixon_debug(CLIXON_DBG_DETAIL, "%s retval:%d", __FUNCTION__, retval);
+    clixon_debug(CLIXON_DBG_XML | CLIXON_DBG_DETAIL, "%s retval:%d", __FUNCTION__, retval);
     if (xpath)
         free(xpath);
     if (nsc)
@@ -1252,7 +1252,7 @@ api_path2xml(char       *api_path,
     cxobj *xroot;
     cbuf  *cberr = NULL;
 
-    clixon_debug(CLIXON_DBG_DETAIL, "%s api_path:%s", __FUNCTION__, api_path);
+    clixon_debug(CLIXON_DBG_XML | CLIXON_DBG_DETAIL, "%s api_path:%s", __FUNCTION__, api_path);
     if ((cberr = cbuf_new()) == NULL){
         clixon_err(OE_UNIX, errno, "cbuf_new");
         goto done;
diff --git a/lib/src/clixon_xml_changelog.c b/lib/src/clixon_xml_changelog.c
index 2e7868f4..b914d1ed 100644
--- a/lib/src/clixon_xml_changelog.c
+++ b/lib/src/clixon_xml_changelog.c
@@ -314,7 +314,7 @@ changelog_op(clixon_handle h,
     return retval;
  fail:
     retval = 0;
-    clixon_debug(CLIXON_DBG_DEFAULT, "%s fail op:%s ", __FUNCTION__, op);
+    clixon_debug(CLIXON_DBG_XML, "%s fail op:%s", __FUNCTION__, op);
     goto done;
 }
     
@@ -349,7 +349,7 @@ changelog_iterate(clixon_handle h,
     }
     retval = 1;
  done:
-    clixon_debug(CLIXON_DBG_DEFAULT, "%s retval: %d", __FUNCTION__, retval);
+    clixon_debug(CLIXON_DBG_XML, "%s retval: %d", __FUNCTION__, retval);
     if (vec)
         free(vec);
     return retval;
diff --git a/lib/src/clixon_xml_default.c b/lib/src/clixon_xml_default.c
index 50923124..6dc72e95 100644
--- a/lib/src/clixon_xml_default.c
+++ b/lib/src/clixon_xml_default.c
@@ -178,7 +178,7 @@ xml_default_choice(yang_stmt *yc,
     yang_stmt *yca = NULL;
     yang_stmt *ydef;
 
-    clixon_debug(CLIXON_DBG_DETAIL, "%s", __FUNCTION__);
+    clixon_debug(CLIXON_DBG_XML | CLIXON_DBG_DETAIL, "%s", __FUNCTION__);
     /* 1. Is there a default case and no child under this choice?
      */
     x = NULL;
diff --git a/lib/src/clixon_xml_io.c b/lib/src/clixon_xml_io.c
index a9ae7ab8..924866d9 100644
--- a/lib/src/clixon_xml_io.c
+++ b/lib/src/clixon_xml_io.c
@@ -577,7 +577,7 @@ _xml_parse(const char *str,
     int             failed = 0; /* yang assignment */
     int             i;
 
-    clixon_debug(CLIXON_DBG_DETAIL, "%s", __FUNCTION__);
+    clixon_debug(CLIXON_DBG_XML | CLIXON_DBG_DETAIL, "%s", __FUNCTION__);
     if (strlen(str) == 0){
         return 1; /* OK */
     }
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 89bbffcd..114a4935 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -212,8 +212,8 @@ xml2cvec(cxobj      *xt,
             }
         }
     }
-    if (clixon_debug_get() > 1){
-        clixon_debug(CLIXON_DBG_DETAIL, "%s cvv:\n", __FUNCTION__);
+    if (clixon_debug_isset(CLIXON_DBG_XML | CLIXON_DBG_DETAIL)){
+        clixon_debug(CLIXON_DBG_ALWAYS, "%s cvv:", __FUNCTION__);
         cvec_print(stderr, cvv);
     }
     *cvv0 = cvv;
diff --git a/lib/src/clixon_xml_sort.c b/lib/src/clixon_xml_sort.c
index 54cf600c..cfd23d2a 100644
--- a/lib/src/clixon_xml_sort.c
+++ b/lib/src/clixon_xml_sort.c
@@ -386,7 +386,7 @@ xml_cmp(cxobj  *x1,
         break;
     } /* switch */
  done:
-    clixon_debug(CLIXON_DBG_DETAIL2, "%s %s %s eq:%d nr: %d %d yi: %d %d", __FUNCTION__, xml_name(x1), xml_name(x2), equal, nr1, nr2, yi1, yi2);
+    clixon_debug(CLIXON_DBG_XML | CLIXON_DBG_DETAIL2, "%s %s %s eq:%d nr: %d %d yi: %d %d", __FUNCTION__, xml_name(x1), xml_name(x2), equal, nr1, nr2, yi1, yi2);
     return equal;
 }