generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

White spaces and coding style

Browse Source 
(cherry picked from commit d909297aa792bcef534073fd92336d5ebec09ecf)
This commit is contained in:
Marcelo Roberto Jimenez 2012-03-08 13:39:31 -03:00
parent 63cccfff08
commit 5373ed560a
1 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ixml/src/ixmlparser.c
View File

@ -1509,40 +1509,31 @@ static int Parser_addNamespace(
pNode = xmlParser->pNeedPrefixNode; pNode = xmlParser->pNeedPrefixNode;
pCur = xmlParser->pCurElement; pCur = xmlParser->pCurElement;
if (!pNode->prefix) {
if( pNode->prefix == NULL ) {
/* element does not have prefix */ /* element does not have prefix */
if( strcmp( pNode->nodeName, pCur->element ) != 0 ) { if (strcmp(pNode->nodeName, pCur->element) != 0)
return IXML_FAILED; return IXML_FAILED;
} if (pCur->namespaceUri) {
if( pCur->namespaceUri != NULL ) {
/* it would be wrong that pNode->namespace != NULL. */ /* it would be wrong that pNode->namespace != NULL. */
assert(pNode->namespaceURI == NULL); assert(pNode->namespaceURI == NULL);
pNode->namespaceURI = safe_strdup(pCur->namespaceUri); pNode->namespaceURI = safe_strdup(pCur->namespaceUri);
if( pNode->namespaceURI == NULL ) { if (!pNode->namespaceURI)
return IXML_INSUFFICIENT_MEMORY; return IXML_INSUFFICIENT_MEMORY;
} }
}
xmlParser->pNeedPrefixNode = NULL; xmlParser->pNeedPrefixNode = NULL;
} else { } else {
if ((strcmp(pNode->nodeName, pCur->element) != 0) && if ((strcmp(pNode->nodeName, pCur->element) != 0) &&
( strcmp( pNode->prefix, pCur->prefix ) != 0 ) ) { (strcmp(pNode->prefix, pCur->prefix) != 0))
return IXML_FAILED; return IXML_FAILED;
}
namespaceUri = Parser_getNameSpace(xmlParser, pCur->prefix); namespaceUri = Parser_getNameSpace(xmlParser, pCur->prefix);
if( namespaceUri != NULL ) { if (namespaceUri) {
pNode->namespaceURI = safe_strdup(namespaceUri); pNode->namespaceURI = safe_strdup(namespaceUri);
if( pNode->namespaceURI == NULL ) { if (!pNode->namespaceURI)
return IXML_INSUFFICIENT_MEMORY; return IXML_INSUFFICIENT_MEMORY;
}
xmlParser->pNeedPrefixNode = NULL; xmlParser->pNeedPrefixNode = NULL;
} }
} }
return IXML_SUCCESS; return IXML_SUCCESS;
} }