From b0d08c32e402b6b4cc710c70b828afbb254fd892 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 15 Mar 2021 14:39:59 -0400
Subject: src/xml.c: Use renamed output functions

---
diff --git a/src/xml.c b/src/xml.c
index c28fbc4..70ed752 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <expat.h>
 #include <SDL_stdinc.h>
+#include "output.h"
 #include "xml.h"
-#include "logging.h"
 
 struct xml_node {
 	void *data;
@@ -42,7 +42,7 @@ xml_check_tag(const char *found, const char *expected)
 void
 xml_unexpected_start_tag(XML_Parser p, const char *found, const char *expected)
 {
-	warn("Found \"%s\" start tag where expected one of \"%s\" in map",
+	db_warn("Found \"%s\" start tag where expected one of \"%s\" in map",
 			found, expected);
 	XML_StopParser(p, XML_FALSE);
 }
@@ -50,7 +50,7 @@ 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)
 {
-	warn("Found \"%s\" end tag where expected one of \"%s\" in map",
+	db_warn("Found \"%s\" end tag where expected one of \"%s\" in map",
 			found, expected);
 	XML_StopParser(p, XML_FALSE);
 }
@@ -64,13 +64,13 @@ xml_get_uint32_attr(XML_Parser p, const char **attr, const char *name,
 			if (sscanf(attr[1], "%" PRIu32, dest) == 1) {
 				return;
 			} else if (req) {
-				warn("Invalid \"%s\" attribute value", name);
+				db_warn("Invalid \"%s\" attribute value", name);
 				XML_StopParser(p, XML_FALSE);
 			}
 		}
 	}
 	if (req) {
-		warn("Required attribute \"%s\" not found", name);
+		db_warn("Required attribute \"%s\" not found", name);
 		XML_StopParser(p, XML_FALSE);
 	}
 }
@@ -84,13 +84,13 @@ xml_get_int_attr(XML_Parser p, const char **attr, const char *name,
 			if (sscanf(attr[1], "%d", dest) == 1) {
 				return;
 			} else if (req) {
-				warn("Invalid \"%s\" attribute value", name);
+				db_warn("Invalid \"%s\" attribute value", name);
 				XML_StopParser(p, XML_FALSE);
 			}
 		}
 	}
 	if (req) {
-		warn("Required attribute \"%s\" not found", name);
+		db_warn("Required attribute \"%s\" not found", name);
 		XML_StopParser(p, XML_FALSE);
 	}
 }
@@ -106,7 +106,7 @@ xml_get_string_attr(XML_Parser p, const char **attr, const char *name,
 		}
 	}
 	if (req) {
-		warn("Required attribute \"%s\" not found", name);
+		db_warn("Required attribute \"%s\" not found", name);
 		XML_StopParser(p, XML_FALSE);
 	}
 }
--
cgit v0.9.1