diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
| commit | f452a2b3e4e4279b27594a8ddb66525442d59227 (patch) | |
| tree | d05cb62c5515ada33076d3cc3e49b664733a478c /ext/dom/node.c | |
| parent | 038ba12e8724d537040e88ec794354b0c063f0a6 (diff) | |
| download | php-f452a2b3e4e4279b27594a8ddb66525442d59227.tar.gz | |
Imported Upstream version 5.3.7upstream/5.3.7
Diffstat (limited to 'ext/dom/node.c')
| -rw-r--r-- | ext/dom/node.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/ext/dom/node.c b/ext/dom/node.c index c93373a40..a2c9c280a 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: node.c 314493 2011-08-08 12:29:32Z iliaa $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -155,7 +155,7 @@ const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */ PHP_ME(domnode, getLineNo, arginfo_dom_node_getLineNo, ZEND_ACC_PUBLIC) PHP_ME(domnode, C14N, arginfo_dom_node_C14N, ZEND_ACC_PUBLIC) PHP_ME(domnode, C14NFile, arginfo_dom_node_C14NFile, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -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 */ |