FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better XML error catching, proposed by Richard Harrison.

Browse Source
This commit is contained in:
ehofman
2005-09-15 16:54:27 +00:00
parent 3583c13339
commit 9dfd6970f1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/xml/easyxml.cxx
+12 -8
View File
@@ -220,34 +220,37 @@ readXML (istream &input, XMLVisitor &visitor, const string &path)
// FIXME: get proper error string from system // FIXME: get proper error string from system
if (!input.good()) { if (!input.good()) {
XML_ParserFree(parser); sg_io_exception ex ("Problem reading file",
throw sg_io_exception("Problem reading file",
sg_location(path, sg_location(path,
XML_GetCurrentLineNumber(parser), XML_GetCurrentLineNumber(parser),
XML_GetCurrentColumnNumber(parser)), XML_GetCurrentColumnNumber(parser)),
"SimGear XML Parser"); "SimGear XML Parser");
XML_ParserFree(parser);
throw ex;
} }
input.read(buf,16384); input.read(buf,16384);
if (!XML_Parse(parser, buf, input.gcount(), false)) { if (!XML_Parse(parser, buf, input.gcount(), false)) {
XML_ParserFree(parser); sg_io_exception ex (XML_ErrorString(XML_GetErrorCode(parser)),
throw sg_io_exception(XML_ErrorString(XML_GetErrorCode(parser)),
sg_location(path, sg_location(path,
XML_GetCurrentLineNumber(parser), XML_GetCurrentLineNumber(parser),
XML_GetCurrentColumnNumber(parser)), XML_GetCurrentColumnNumber(parser)),
"SimGear XML Parser"); "SimGear XML Parser");
XML_ParserFree(parser);
throw ex;
} }
} }
// Verify end of document. // Verify end of document.
if (!XML_Parse(parser, buf, 0, true)) { if (!XML_Parse(parser, buf, 0, true)) {
XML_ParserFree(parser); sg_io_exception ex (XML_ErrorString(XML_GetErrorCode(parser)),
throw sg_io_exception(XML_ErrorString(XML_GetErrorCode(parser)),
sg_location(path, sg_location(path,
XML_GetCurrentLineNumber(parser), XML_GetCurrentLineNumber(parser),
XML_GetCurrentColumnNumber(parser)), XML_GetCurrentColumnNumber(parser)),
"SimGear XML Parser"); "SimGear XML Parser");
XML_ParserFree(parser);
throw ex;
} }
XML_ParserFree(parser); XML_ParserFree(parser);
@@ -286,12 +289,13 @@ readXML (const char *buf, const int size, XMLVisitor &visitor)
visitor.startXML(); visitor.startXML();
if (!XML_Parse(parser, buf, size, false)) { if (!XML_Parse(parser, buf, size, false)) {
XML_ParserFree(parser); sg_io_exception ex (XML_ErrorString(XML_GetErrorCode(parser)),
throw sg_io_exception(XML_ErrorString(XML_GetErrorCode(parser)),
sg_location("In-memory XML buffer", sg_location("In-memory XML buffer",
XML_GetCurrentLineNumber(parser), XML_GetCurrentLineNumber(parser),
XML_GetCurrentColumnNumber(parser)), XML_GetCurrentColumnNumber(parser)),
"SimGear XML Parser"); "SimGear XML Parser");
XML_ParserFree(parser);
throw ex;
} }
XML_ParserFree(parser); XML_ParserFree(parser);