Merge pull request #292 from dawagner/better-libxml2-error-messages

Print the file and line number context in libxml2 error messages
intel · Oct 20, 2015 · 5c1d873 · 5c1d873
2 parents d1c6bf3 + 1015c96
commit 5c1d873
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/xmlserializer/XmlSerializingContext.cpp b/xmlserializer/XmlSerializingContext.cpp
@@ -57,5 +57,10 @@ void CXmlSerializingContext::appendLineToError(const std::string& strAppend)
 void CXmlSerializingContext::structuredErrorHandler(void* userData, xmlErrorPtr error)
 {
     CXmlSerializingContext *self = static_cast<CXmlSerializingContext *>(userData);
-    self->_strXmlError += error->message;
+
+    std::string filename = (error->file != NULL) ? error->file : "(user input)";
+    // xmlErrorPtr->int2 contains the column; see xmlerror.h
+    self->_strXmlError += filename + ":" +
+                          std::to_string(error->line) + ":" + std::to_string(error->int2) + ": " +
+                          error->message;
 }