diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2011-08-08 12:29:32 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2011-08-08 12:29:32 +0000 |
| commit | e2e96913bf8628cb6bbf75cef5c62c714776c7ba (patch) | |
| tree | 019d6b005cb864cb6191a24bcf0c6f1d37aa8874 /ext/dom/node.c | |
| parent | 92d68c62af297e1cf50b8b720f988e79224b3c4b (diff) | |
| download | php-git-e2e96913bf8628cb6bbf75cef5c62c714776c7ba.tar.gz | |
Deadcode & sizeof fix for issues found by coverity
(different patch for 5.4+ will follow shortly)
Diffstat (limited to 'ext/dom/node.c')
| -rw-r--r-- | ext/dom/node.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/ext/dom/node.c b/ext/dom/node.c index 839c797bb6..38a26202e1 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -998,7 +998,7 @@ Since: */ PHP_FUNCTION(dom_node_insert_before) { - zval *id, *node, *ref = NULL, *rv = NULL; + zval *id, *node, *ref = NULL; xmlNodePtr child, new_child, parentp, refp; dom_object *intern, *childobj, *refpobj; int ret, stricterror; @@ -1087,7 +1087,7 @@ PHP_FUNCTION(dom_node_insert_before) xmlUnlinkNode((xmlNodePtr) lastattr); php_libxml_node_free_resource((xmlNodePtr) lastattr TSRMLS_CC); } else { - DOM_RET_OBJ(rv, child, &ret, intern); + DOM_RET_OBJ_EX(child, &ret, intern); return; } } @@ -1129,7 +1129,7 @@ PHP_FUNCTION(dom_node_insert_before) xmlUnlinkNode((xmlNodePtr) lastattr); php_libxml_node_free_resource((xmlNodePtr) lastattr TSRMLS_CC); } else { - DOM_RET_OBJ(rv, child, &ret, intern); + DOM_RET_OBJ_EX(child, &ret, intern); return; } } @@ -1148,7 +1148,7 @@ PHP_FUNCTION(dom_node_insert_before) dom_reconcile_ns(parentp->doc, new_child); - DOM_RET_OBJ(rv, new_child, &ret, intern); + DOM_RET_OBJ_EX(new_child, &ret, intern); } /* }}} end dom_node_insert_before */ @@ -1212,9 +1212,6 @@ PHP_FUNCTION(dom_node_replace_child) } if (foundoldchild) { - xmlNodePtr node; - zval *rv = NULL; - if (newchild->type == XML_DOCUMENT_FRAG_NODE) { xmlNodePtr prevsib, nextsib; prevsib = oldchild->prev; @@ -1232,10 +1229,10 @@ PHP_FUNCTION(dom_node_replace_child) newchildobj->document = intern->document; php_libxml_increment_doc_ref((php_libxml_node_object *)newchildobj, NULL TSRMLS_CC); } - node = xmlReplaceNode(oldchild, newchild); + xmlReplaceNode(oldchild, newchild); dom_reconcile_ns(nodep->doc, newchild); } - DOM_RET_OBJ(rv, oldchild, &ret, intern); + DOM_RET_OBJ_EX(oldchild, &ret, intern); return; } else { php_dom_throw_error(NOT_FOUND_ERR, dom_get_strict_error(intern->document) TSRMLS_CC); @@ -1283,9 +1280,8 @@ PHP_FUNCTION(dom_node_remove_child) while (children) { if (children == child) { - zval *rv = NULL; xmlUnlinkNode(child); - DOM_RET_OBJ(rv, child, &ret, intern); + DOM_RET_OBJ_EX(child, &ret, intern); return; } children = children->next; @@ -1302,7 +1298,7 @@ Since: */ PHP_FUNCTION(dom_node_append_child) { - zval *id, *node, *rv = NULL; + zval *id, *node; xmlNodePtr child, nodep, new_child = NULL; dom_object *intern, *childobj; int ret, stricterror; @@ -1393,7 +1389,7 @@ PHP_FUNCTION(dom_node_append_child) dom_reconcile_ns(nodep->doc, new_child); - DOM_RET_OBJ(rv, new_child, &ret, intern); + DOM_RET_OBJ_EX(new_child, &ret, intern); } /* }}} end dom_node_append_child */ @@ -1431,7 +1427,6 @@ Since: */ PHP_FUNCTION(dom_node_clone_node) { - zval *rv = NULL; zval *id; xmlNode *n, *node; int ret; @@ -1483,7 +1478,7 @@ PHP_FUNCTION(dom_node_clone_node) intern = NULL; } - DOM_RET_OBJ(rv, node, &ret, intern); + DOM_RET_OBJ_EX(node, &ret, intern); } /* }}} end dom_node_clone_node */ |