AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge fix for save file error

This commit is contained in:
Lee Thomason 2015-03-26 11:18:21 -07:00
parent ea21390f28 189198f19c
commit f657783cf2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tinyxml2.cpp
View File

@ -1879,6 +1879,9 @@ XMLError XMLDocument::SaveFile( const char* filename, bool compact )
XMLError XMLDocument::SaveFile( FILE* fp, bool compact ) XMLError XMLDocument::SaveFile( FILE* fp, bool compact )
{ {
// Clear any error from the last save, otherwise it will get reported
// for *this* call.
SetError( XML_NO_ERROR, 0, 0 );
XMLPrinter stream( fp, compact ); XMLPrinter stream( fp, compact );
Print( &stream ); Print( &stream );
return _errorID; return _errorID;

8
xmltest.cpp
View File

@ -1433,6 +1433,14 @@ int main( int argc, const char ** argv )
XMLPrinter printer; XMLPrinter printer;
newElement->Accept( &printer ); newElement->Accept( &printer );
} }
{
// Issue 302. Clear errors from LoadFile/SaveFile
XMLDocument doc;
doc.SaveFile( "./no/such/path/pretty.xml" );
XMLTest( "Issue 302. Fail to save", doc.ErrorName(), "XML_ERROR_FILE_COULD_NOT_BE_OPENED" );
doc.SaveFile( "./resources/out/compact.xml", true );
XMLTest( "Issue 302. Subsequent success in saving", doc.ErrorName(), "XML_SUCCESS" );
}
// ----------- Performance tracking -------------- // ----------- Performance tracking --------------
{ {