kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code shuffle so function has only one exit point.

Browse Source
This commit is contained in:
Nathan Letwory 2011-09-12 10:57:41 +00:00
parent 46aede579e
commit 4a9a0ec3e4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/collada/ErrorHandler.cpp
View File

@ -49,6 +49,8 @@ ErrorHandler::~ErrorHandler()
//-------------------------------------------------------------------- //--------------------------------------------------------------------
bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error ) bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error )
{ {
mError = true;
if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER ) if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER )
{ {
COLLADASaxFWL::SaxParserError* saxParserError = (COLLADASaxFWL::SaxParserError*) error; COLLADASaxFWL::SaxParserError* saxParserError = (COLLADASaxFWL::SaxParserError*) error;
@ -59,32 +61,29 @@ bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error )
{ {
if ( strcmp(parserError.getElement(), "effect") == 0 ) if ( strcmp(parserError.getElement(), "effect") == 0 )
{ {
return false; mError = false;
} }
} }
if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT) if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT)
{ {
if ( (strcmp(parserError.getElement(), "extra") == 0) if ( !((strcmp(parserError.getElement(), "extra") == 0)
&& (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0)) && (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0)))
{ {
return false; mError = false;
} }
} }
if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE) if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_COULD_NOT_OPEN_FILE)
{ {
std::cout << "Couldn't open file" << std::endl; std::cout << "Couldn't open file" << std::endl;
mError = true;
} }
std::cout << "Schema validation error: " << parserError.getErrorMessage() << std::endl; std::cout << "Schema validation error: " << parserError.getErrorMessage() << std::endl;
mError = true;
} }
else if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL ) else if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL )
{ {
COLLADASaxFWL::SaxFWLError* saxFWLError = (COLLADASaxFWL::SaxFWLError*) error; COLLADASaxFWL::SaxFWLError* saxFWLError = (COLLADASaxFWL::SaxFWLError*) error;
std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl; std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl;
mError = true;
} }
return false; return false;
} }