From: Johan Malm <jgm323@gmail.com>
Date: Tue, 30 Mar 2021 21:40:41 +0000 (+0100)
Subject: rcxml: simplify debugging nodenames
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=0a6eead36b4466be5f1f33df1ba3ffb252e125ea;p=proto%2Flabwc.git

rcxml: simplify debugging nodenames
---

diff --git a/include/config/rcxml.h b/include/config/rcxml.h
index 985b6530..69beac98 100644
--- a/include/config/rcxml.h
+++ b/include/config/rcxml.h
@@ -22,6 +22,5 @@ extern struct rcxml rc;
 void rcxml_parse_xml(struct buf *b);
 void rcxml_read(const char *filename);
 void rcxml_finish(void);
-void rcxml_get_nodenames(struct buf *b);
 
 #endif /* __LABWC_RCXML_H */
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 96e4aa67..71a442a4 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -22,8 +22,6 @@
 
 static bool in_keybind = false;
 static bool is_attribute = false;
-static bool write_to_nodename_buffer = false;
-static struct buf *nodename_buffer;
 static struct keybind *current_keybind;
 
 enum font_place {
@@ -113,17 +111,11 @@ entry(xmlNode *node, char *nodename, char *content)
 	}
 	string_truncate_at_pattern(nodename, ".openbox_config");
 
-	/* for debugging */
-	if (write_to_nodename_buffer) {
+	if (getenv("LABWC_DEBUG_CONFIG_NODENAMES")) {
 		if (is_attribute) {
-			buf_add(nodename_buffer, "@");
+			printf("@");
 		}
-		buf_add(nodename_buffer, nodename);
-		if (content) {
-			buf_add(nodename_buffer, ": ");
-			buf_add(nodename_buffer, content);
-		}
-		buf_add(nodename_buffer, "\n");
+		printf("%s: %s\n", nodename, content);
 	}
 
 	if (!content) {
@@ -355,10 +347,3 @@ rcxml_finish(void)
 		zfree(k);
 	}
 }
-
-void
-rcxml_get_nodenames(struct buf *b)
-{
-	write_to_nodename_buffer = true;
-	nodename_buffer = b;
-}