From 0fe882d8dc531743a7f9d95103b2e24bef7c7c6a Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 15 Mar 2021 14:49:06 -0400
Subject: xml_(): Prefix symbols

---
diff --git a/src/xml.c b/src/xml.c
index 70ed752..bea7295 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -25,22 +25,23 @@
 #include "output.h"
 #include "xml.h"
 
-struct xml_node {
+struct _db_xml_node {
 	void *data;
 	XML_StartElementHandler start;
 	XML_EndElementHandler end;
 	XML_CharacterDataHandler charhndl;
-	struct xml_node *parent;
+	struct _db_xml_node *parent;
 };
 
 int
-xml_check_tag(const char *found, const char *expected)
+db_xml_check_tag(const char *found, const char *expected)
 {
 	return strcmp(found, expected) == 0;
 }
 
 void
-xml_unexpected_start_tag(XML_Parser p, const char *found, const char *expected)
+db_xml_unexpected_start_tag(XML_Parser p, const char *found,
+		const char *expected)
 {
 	db_warn("Found \"%s\" start tag where expected one of \"%s\" in map",
 			found, expected);
@@ -48,7 +49,8 @@ xml_unexpected_start_tag(XML_Parser p, const char *found, const char *expected)
 }
 
 void
-xml_unexpected_end_tag(XML_Parser p, const char *found, const char *expected)
+db_xml_unexpected_end_tag(XML_Parser p, const char *found,
+		const char *expected)
 {
 	db_warn("Found \"%s\" end tag where expected one of \"%s\" in map",
 			found, expected);
@@ -56,7 +58,7 @@ xml_unexpected_end_tag(XML_Parser p, const char *found, const char *expected)
 }
 
 void
-xml_get_uint32_attr(XML_Parser p, const char **attr, const char *name,
+db_xml_get_uint32_attr(XML_Parser p, const char **attr, const char *name,
 		Uint32 *dest, int req)
 {
 	for (; attr[0] != NULL; attr += 2) {
@@ -76,7 +78,7 @@ xml_get_uint32_attr(XML_Parser p, const char **attr, const char *name,
 }
 
 void
-xml_get_int_attr(XML_Parser p, const char **attr, const char *name,
+db_xml_get_int_attr(XML_Parser p, const char **attr, const char *name,
 		int *dest, int req)
 {
 	for (; attr[0] != NULL; attr += 2) {
@@ -96,7 +98,7 @@ xml_get_int_attr(XML_Parser p, const char **attr, const char *name,
 }
 
 void
-xml_get_string_attr(XML_Parser p, const char **attr, const char *name,
+db_xml_get_string_attr(XML_Parser p, const char **attr, const char *name,
 		char **dest, int req)
 {
 	for (; attr[0] != NULL; attr += 2) {
@@ -112,11 +114,11 @@ xml_get_string_attr(XML_Parser p, const char **attr, const char *name,
 }
 
 void
-xml_node_push(XML_Parser p, void *data,
+db_xml_node_push(XML_Parser p, void *data,
 		XML_StartElementHandler start, XML_EndElementHandler end,
 		XML_CharacterDataHandler charhndl)
 {
-	struct xml_node *n;
+	struct _db_xml_node *n;
 
 	n = malloc(sizeof(*n));
 	if (n == NULL) {
@@ -126,7 +128,7 @@ xml_node_push(XML_Parser p, void *data,
 	n->start = start;
 	n->end = end;
 	n->charhndl = charhndl;
-	n->parent = (struct xml_node *) XML_GetUserData(p);
+	n->parent = (struct _db_xml_node *) XML_GetUserData(p);
 	XML_SetUserData(p, n);
 	XML_SetStartElementHandler(p, n->start);
 	XML_SetEndElementHandler(p, n->end);
@@ -134,17 +136,17 @@ xml_node_push(XML_Parser p, void *data,
 }
 
 void *
-xml_node_pop(XML_Parser p)
+db_xml_node_pop(XML_Parser p)
 {
-	struct xml_node *n;
+	struct _db_xml_node *n;
 	void *data;
 
-	n = (struct xml_node *) XML_GetUserData(p);
+	n = (struct _db_xml_node *) XML_GetUserData(p);
 	data = n->data;
 	XML_SetUserData(p, n->parent);
 	free(n);
 
-	n = (struct xml_node *) XML_GetUserData(p);
+	n = (struct _db_xml_node *) XML_GetUserData(p);
 	if (n == NULL) {
 		XML_SetStartElementHandler(p, NULL);
 		XML_SetEndElementHandler(p, NULL);
@@ -159,11 +161,11 @@ xml_node_pop(XML_Parser p)
 }
 
 void *
-xml_node_peek(XML_Parser p)
+db_xml_node_peek(XML_Parser p)
 {
-	struct xml_node *n;
+	struct _db_xml_node *n;
 
-	n = (struct xml_node *) XML_GetUserData(p);
+	n = (struct _db_xml_node *) XML_GetUserData(p);
 
 	return n->data;
 }
diff --git a/src/xml.h b/src/xml.h
index 519ca2d..db887fc 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -17,27 +17,27 @@
  * along with Dodge Balls.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef XML_H
-#define XML_H
+#ifndef DB_XML_H_
+#define DB_XML_H_
 
 #include <expat.h>
 #include <SDL_stdinc.h>
 
-int xml_check_tag(const char *found, const char *expected);
-void xml_unexpected_start_tag(XML_Parser p, const char *found,
+int db_xml_check_tag(const char *found, const char *expected);
+void db_xml_unexpected_start_tag(XML_Parser p, const char *found,
 		const char *expected);
-void xml_unexpected_end_tag(XML_Parser p, const char *found,
+void db_xml_unexpected_end_tag(XML_Parser p, const char *found,
 		const char *expected);
-void xml_get_int_attr(XML_Parser p, const char **attr, const char *name,
+void db_xml_get_int_attr(XML_Parser p, const char **attr, const char *name,
 		int *dest, int req);
-void xml_get_uint32_attr(XML_Parser p, const char **attr, const char *name,
+void db_xml_get_uint32_attr(XML_Parser p, const char **attr, const char *name,
 		Uint32 *dest, int req);
-void xml_get_string_attr(XML_Parser p, const char **attr, const char *name,
+void db_xml_get_string_attr(XML_Parser p, const char **attr, const char *name,
 		char **dest, int req);
-void xml_node_push(XML_Parser p, void *data,
+void db_xml_node_push(XML_Parser p, void *data,
 		XML_StartElementHandler start, XML_EndElementHandler end,
 		XML_CharacterDataHandler charhndl);
-void *xml_node_pop(XML_Parser p);
-void *xml_node_peek(XML_Parser p);
+void *db_xml_node_pop(XML_Parser p);
+void *db_xml_node_peek(XML_Parser p);
 
-#endif
+#endif  /* DB_XML_H_ */
--
cgit v0.9.1