diff options
| -rw-r--r-- | src/xml.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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); } } |