php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

dom: Merge declaration and assignment

Browse Source
This commit is contained in:
ndossche
2026-03-11 23:30:39 +01:00
committed by Nora Dossche
parent 28c6659b06
commit 46357cbaaf
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/dom/xpath_callbacks.c
View File

@@ -430,14 +430,12 @@ static zend_result php_dom_xpath_callback_dispatch(php_dom_xpath_callbacks *xpat
if (Z_TYPE(callback_retval) != IS_UNDEF) { if (Z_TYPE(callback_retval) != IS_UNDEF) {
if (Z_TYPE(callback_retval) == IS_OBJECT if (Z_TYPE(callback_retval) == IS_OBJECT
&& (instanceof_function(Z_OBJCE(callback_retval), dom_get_node_ce(php_dom_follow_spec_node((const xmlNode *) ctxt->context->doc))))) { && (instanceof_function(Z_OBJCE(callback_retval), dom_get_node_ce(php_dom_follow_spec_node((const xmlNode *) ctxt->context->doc))))) {
xmlNode *nodep;
dom_object *obj;
if (xpath_callbacks->node_list == NULL) { if (xpath_callbacks->node_list == NULL) {
xpath_callbacks->node_list = zend_new_array(0); xpath_callbacks->node_list = zend_new_array(0);
} }
zend_hash_next_index_insert_new(xpath_callbacks->node_list, &callback_retval); zend_hash_next_index_insert_new(xpath_callbacks->node_list, &callback_retval);
obj = Z_DOMOBJ_P(&callback_retval); dom_object *obj = Z_DOMOBJ_P(&callback_retval);
nodep = dom_object_get_node(obj); xmlNodePtr nodep = dom_object_get_node(obj);
valuePush(ctxt, xmlXPathNewNodeSet(nodep)); valuePush(ctxt, xmlXPathNewNodeSet(nodep));
} else if (Z_TYPE(callback_retval) == IS_FALSE || Z_TYPE(callback_retval) == IS_TRUE) { } else if (Z_TYPE(callback_retval) == IS_FALSE || Z_TYPE(callback_retval) == IS_TRUE) {
valuePush(ctxt, xmlXPathNewBoolean(Z_TYPE(callback_retval) == IS_TRUE)); valuePush(ctxt, xmlXPathNewBoolean(Z_TYPE(callback_retval) == IS_TRUE));