XML: Add a parameter fileName, for error reporting, to XMLParser

xoreos · Jun 15, 2018 · 06b356e · 06b356e
1 parent a4ca409
commit 06b356e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/xml/xmlparser.cpp b/src/xml/xmlparser.cpp
@@ -74,7 +74,7 @@ static void deinitXML() {
 }
 
 
-XMLParser::XMLParser(Common::ReadStream &stream, bool makeLower) {
+XMLParser::XMLParser(Common::ReadStream &stream, bool makeLower, const Common::UString &fileName) {
 	initXML();
 
 	Common::UString parseError;
@@ -83,7 +83,8 @@ XMLParser::XMLParser(Common::ReadStream &stream, bool makeLower) {
 	const int options = XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS | XML_PARSE_NONET |
 	                    XML_PARSE_NSCLEAN   | XML_PARSE_NOCDATA;
 
-	xmlDocPtr xml = xmlReadIO(readStream, closeStream, static_cast<void *>(&stream), "stream.xml", 0, options);
+	xmlDocPtr xml = xmlReadIO(readStream, closeStream, static_cast<void *>(&stream),
+	                          fileName.c_str(), 0, options);
 	if (!xml) {
 		Common::Exception e;
 

diff --git a/src/xml/xmlparser.h b/src/xml/xmlparser.h
@@ -51,8 +51,10 @@ class XMLParser : boost::noncopyable {
 	 *
 	 *  @param stream The stream to read the XML from.
 	 *  @param makeLower Should all tags be converted to lowercase, to ease case-insensitive comparison?
+	 *  @param fileName The file name to tell libxml2. Only used for error reporting.
 	 */
-	XMLParser(Common::ReadStream &stream, bool makeLower = false);
+	XMLParser(Common::ReadStream &stream, bool makeLower = false,
+	          const Common::UString &fileName = "stream.xml");
 	~XMLParser();
 
 	/** Return the XML root node. */