xml_(): Prefix symbols

1 files changed, 20 insertions, 18 deletions

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;
 }