From 5373ed560a4514bf8e81b3ecc5e2e9d209256026 Mon Sep 17 00:00:00 2001 From: Marcelo Roberto Jimenez Date: Thu, 8 Mar 2012 13:39:31 -0300 Subject: [PATCH] White spaces and coding style (cherry picked from commit d909297aa792bcef534073fd92336d5ebec09ecf) --- ixml/src/ixmlparser.c | 69 +++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/ixml/src/ixmlparser.c b/ixml/src/ixmlparser.c index 7fab80b..2924c07 100644 --- a/ixml/src/ixmlparser.c +++ b/ixml/src/ixmlparser.c @@ -1503,47 +1503,38 @@ static int Parser_addNamespace( /*! [in] The XML parser. */ Parser *xmlParser) { - IXML_Node *pNode; - IXML_ElementStack *pCur; - const char *namespaceUri; + IXML_Node *pNode; + IXML_ElementStack *pCur; + const char *namespaceUri; - pNode = xmlParser->pNeedPrefixNode; - pCur = xmlParser->pCurElement; + pNode = xmlParser->pNeedPrefixNode; + pCur = xmlParser->pCurElement; + if (!pNode->prefix) { + /* element does not have prefix */ + if (strcmp(pNode->nodeName, pCur->element) != 0) + return IXML_FAILED; + if (pCur->namespaceUri) { + /* it would be wrong that pNode->namespace != NULL. */ + assert(pNode->namespaceURI == NULL); + pNode->namespaceURI = safe_strdup(pCur->namespaceUri); + if (!pNode->namespaceURI) + return IXML_INSUFFICIENT_MEMORY; + } + xmlParser->pNeedPrefixNode = NULL; + } else { + if ((strcmp(pNode->nodeName, pCur->element) != 0) && + (strcmp(pNode->prefix, pCur->prefix) != 0)) + return IXML_FAILED; + namespaceUri = Parser_getNameSpace(xmlParser, pCur->prefix); + if (namespaceUri) { + pNode->namespaceURI = safe_strdup(namespaceUri); + if (!pNode->namespaceURI) + return IXML_INSUFFICIENT_MEMORY; + xmlParser->pNeedPrefixNode = NULL; + } + } - if( pNode->prefix == NULL ) { - /* element does not have prefix */ - if( strcmp( pNode->nodeName, pCur->element ) != 0 ) { - return IXML_FAILED; - } - if( pCur->namespaceUri != NULL ) { - /* it would be wrong that pNode->namespace != NULL. */ - assert( pNode->namespaceURI == NULL ); - - pNode->namespaceURI = safe_strdup( pCur->namespaceUri ); - if( pNode->namespaceURI == NULL ) { - return IXML_INSUFFICIENT_MEMORY; - } - } - - xmlParser->pNeedPrefixNode = NULL; - - } else { - if( ( strcmp( pNode->nodeName, pCur->element ) != 0 ) && - ( strcmp( pNode->prefix, pCur->prefix ) != 0 ) ) { - return IXML_FAILED; - } - - namespaceUri = Parser_getNameSpace( xmlParser, pCur->prefix ); - if( namespaceUri != NULL ) { - pNode->namespaceURI = safe_strdup( namespaceUri ); - if( pNode->namespaceURI == NULL ) { - return IXML_INSUFFICIENT_MEMORY; - } - - xmlParser->pNeedPrefixNode = NULL; - } - } - return IXML_SUCCESS; + return IXML_SUCCESS; }