[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40160] trunk/blender/source/blender/ collada/ErrorHandler.cpp: Code shuffle so function has only one exit point.

[Nathan Letwory]

Revision: 40160
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40160
Author:   jesterking
Date:     2011-09-12 10:57:41 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Code shuffle so function has only one exit point.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ErrorHandler.cpp

Modified: trunk/blender/source/blender/collada/ErrorHandler.cpp
===================================================================
--- trunk/blender/source/blender/collada/ErrorHandler.cpp	2011-09-12 09:55:04 UTC (rev 40159)
+++ trunk/blender/source/blender/collada/ErrorHandler.cpp	2011-09-12 10:57:41 UTC (rev 40160)
@@ -49,6 +49,8 @@
 //--------------------------------------------------------------------
 bool ErrorHandler::handleError( const COLLADASaxFWL::IError* error )
 {
+	mError = true;
+	
 	if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXPARSER )
 	{
 		COLLADASaxFWL::SaxParserError* saxParserError = (COLLADASaxFWL::SaxParserError*) error;
@@ -59,32 +61,29 @@
 		{
 			if ( strcmp(parserError.getElement(), "effect") == 0 )
 			{
-				return false;
+				mError = false;
 			}
 		}
 		if ( parserError.getErrorType() == GeneratedSaxParser::ParserError::ERROR_VALIDATION_SEQUENCE_PREVIOUS_SIBLING_NOT_PRESENT)
 		{
-			if ( (strcmp(parserError.getElement(), "extra") == 0) 
-				&& (strcmp(parserError.getAdditionalText().c_str(), "sibling: fx_profile_abstract") == 0)) 
+			if ( !((strcmp(parserError.getElement(), "extra") == 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)
 		{
 			std::cout << "Couldn't open file" << std::endl;
-			mError = true;
 		}
 
 		std::cout << "Schema validation error: " << parserError.getErrorMessage() << std::endl;
-		mError = true;
 	}
 	else if ( error->getErrorClass() == COLLADASaxFWL::IError::ERROR_SAXFWL )
 	{
 		COLLADASaxFWL::SaxFWLError* saxFWLError = (COLLADASaxFWL::SaxFWLError*) error;
 		std::cout << "Sax FWL Error: " << saxFWLError->getErrorMessage() << std::endl;
-		mError = true;
 	}
 	return false;
 }