From 0c6c5631cdab58366345f0069151d1634bdb543e Mon Sep 17 00:00:00 2001 From: Randall Britten Date: Fri, 13 Mar 2015 15:48:27 +1300 Subject: [PATCH] Whitespace changes only. Search-n-replaced some tabs with spaces, and corrected resulting indentation where necessary. --- core/src/FieldmlDOM.cpp | 62 ++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/core/src/FieldmlDOM.cpp b/core/src/FieldmlDOM.cpp index 822ecb2..7f92b36 100644 --- a/core/src/FieldmlDOM.cpp +++ b/core/src/FieldmlDOM.cpp @@ -123,7 +123,7 @@ xmlMyExternalEntityLoader(const char *URL, const char *ID, xmlParserInputPtr ret = 0; if (0 == strcmp(URL, "http://www.cellml.org/tools/cellml_1_1_schema/common/xlink-href.xsd")) - ret = xmlNewStringInputStream(ctxt, (const xmlChar *)HREF_STRING_XSD); + ret = xmlNewStringInputStream(ctxt, (const xmlChar *)HREF_STRING_XSD); if (ret != NULL) return(ret); if (defaultLoader != NULL) @@ -143,7 +143,7 @@ static int validate( FieldmlErrorHandler *errorHandler, xmlParserInputBufferPtr xmlSubstituteEntitiesDefault( 1 ); if (!defaultLoader) - defaultLoader = xmlGetExternalEntityLoader(); + defaultLoader = xmlGetExternalEntityLoader(); xmlSetExternalEntityLoader(xmlMyExternalEntityLoader); @@ -239,12 +239,12 @@ FmlObjectHandle getObjectAttribute( xmlNodePtr node, const xmlChar *attribute, P break; } if (nodeObjectName) - xmlFree(const_cast(nodeObjectName)); + xmlFree(const_cast(nodeObjectName)); } FmlObjectHandle objectHandle = Fieldml_GetObjectByName( state.session, objectName ); if (objectHandle == FML_INVALID_HANDLE) - state.errorHandler->logError( "FieldML Object attribute not found", objectName ); + state.errorHandler->logError( "FieldML Object attribute not found", objectName ); xmlFree(const_cast(objectName)); @@ -467,7 +467,7 @@ class ArrayDataSourceParser : int err; FmlObjectHandle dataSource = Fieldml_CreateArrayDataSource( state.session, name, resource, location, rank ); - xmlFree(const_cast(location)); + xmlFree(const_cast(location)); if( dataSource == FML_INVALID_HANDLE ) { state.errorHandler->logError( "Malformed ArrayDataSource" ); @@ -563,7 +563,7 @@ class DataResourceParser : int err = textStringParser.parseNode( stringDescription, state ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } } @@ -571,7 +571,7 @@ class DataResourceParser : if( resource == FML_INVALID_HANDLE ) { state.errorHandler->logError( "Invalid array data resource specification", name ); - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return 1; } @@ -579,10 +579,10 @@ class DataResourceParser : int err = processChildren( node, ARRAY_DATA_SOURCE_TAG, state, arrayDataSourceParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return 0; } }; @@ -605,22 +605,22 @@ class BindParser : if (FML_INVALID_HANDLE == argument) { - const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB ); - state.errorHandler->logError( "Incompatible bind", argsAttrib); - xmlFree(const_cast(argsAttrib)); - return 1; + const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB ); + state.errorHandler->logError( "Incompatible bind", argsAttrib); + xmlFree(const_cast(argsAttrib)); + return 1; } else if (FML_INVALID_HANDLE == source) { - const char* sourceAttrib = getStringAttribute( objectNode, SOURCE_ATTRIB ); - state.errorHandler->logError( "Incompatible bind", sourceAttrib); - xmlFree(const_cast(sourceAttrib)); - return 1; + const char* sourceAttrib = getStringAttribute( objectNode, SOURCE_ATTRIB ); + state.errorHandler->logError( "Incompatible bind", sourceAttrib); + xmlFree(const_cast(sourceAttrib)); + return 1; } else if( Fieldml_SetBind( state.session, object, argument, source ) != FML_ERR_NO_ERROR ) { - const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB ); - const char* sourceAttrib = getStringAttribute( objectNode, SOURCE_ATTRIB ); + const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB ); + const char* sourceAttrib = getStringAttribute( objectNode, SOURCE_ATTRIB ); state.errorHandler->logError( "Incompatible bind", argsAttrib, sourceAttrib ); xmlFree(const_cast(argsAttrib)); xmlFree(const_cast(sourceAttrib)); @@ -649,7 +649,7 @@ class BindIndexParser : if( Fieldml_SetIndexEvaluator( state.session, object, indexNumber, argument ) != FML_ERR_NO_ERROR ) { - const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB ); + const char* argsAttrib = getStringAttribute( objectNode, ARGUMENT_ATTRIB ); state.errorHandler->logError( "Incompatible index bind", argsAttrib ); xmlFree(const_cast(argsAttrib)); return 1; @@ -814,7 +814,7 @@ class BooleanTypeParser : FmlObjectHandle handle = Fieldml_CreateBooleanType( state.session, name ); if( handle == FML_INVALID_HANDLE ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); state.errorHandler->logError( "BooleanType creation failed", name ); return 1; } @@ -979,7 +979,7 @@ class MeshTypeParser : err = chartParser.parseNode( chartNode, state ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } @@ -1154,7 +1154,7 @@ class PiecewiseEvaluatorParser : int err = processChildren( evaluatorsNode, EVALUATOR_MAP_ENTRY_TAG, state, piecewiseMapParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } @@ -1162,7 +1162,7 @@ class PiecewiseEvaluatorParser : err = processChildren( getFirstChild( objectNode, BINDINGS_TAG ), BIND_TAG, state, bindParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } @@ -1170,7 +1170,7 @@ class PiecewiseEvaluatorParser : err = processChildren( getFirstChild( objectNode, INDEX_EVALUATORS_TAG ), INDEX_EVALUATOR_TAG, state, indexEvaluatorParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } xmlFree(const_cast(name)); @@ -1247,7 +1247,7 @@ class AggregateEvaluatorParser : int err = processChildren( evaluatorsNode, COMPONENT_EVALUATOR_TAG, state, aggregateMapParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } @@ -1255,7 +1255,7 @@ class AggregateEvaluatorParser : err = processChildren( getFirstChild( objectNode, BINDINGS_TAG ), BIND_TAG, state, bindParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } @@ -1263,7 +1263,7 @@ class AggregateEvaluatorParser : err = processChildren( getFirstChild( objectNode, BINDINGS_TAG ), BIND_INDEX_TAG, state, bindIndexParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } xmlFree(const_cast(name)); @@ -1353,7 +1353,7 @@ class ParameterEvaluatorParser : int err = processChildren( getFirstChild( denseNode, DENSE_INDEXES_TAG ), INDEX_EVALUATOR_TAG, state, parameterIndexEvaluatorParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } } @@ -1386,7 +1386,7 @@ class ParameterEvaluatorParser : int err = processChildren( getFirstChild( dokNode, SPARSE_INDEXES_TAG ), INDEX_EVALUATOR_TAG, state, denseIndexEvaluatorParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } @@ -1394,7 +1394,7 @@ class ParameterEvaluatorParser : err = processChildren( getFirstChild( dokNode, DENSE_INDEXES_TAG ), INDEX_EVALUATOR_TAG, state, sparseIndexEvaluatorParser ); if( err != 0 ) { - xmlFree(const_cast(name)); + xmlFree(const_cast(name)); return err; } }