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

Fix Windows failure (#14096)

Browse Source
This commit is contained in:
Niels Dossche
2024-05-01 00:03:43 +02:00
committed by GitHub
parent 4167d75024
commit 378b015360
2 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/dom/dom_properties.h
View File

@@ -90,9 +90,9 @@ zend_result dom_entity_encoding_read(dom_object *obj, zval *retval);
zend_result dom_entity_version_read(dom_object *obj, zval *retval);
/* entity reference properties */
int dom_entity_reference_child_read(dom_object *obj, zval *retval);
int dom_entity_reference_text_content_read(dom_object *obj, zval *retval);
int dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval);
zend_result dom_entity_reference_child_read(dom_object *obj, zval *retval);
zend_result dom_entity_reference_text_content_read(dom_object *obj, zval *retval);
zend_result dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval);
/* namednodemap properties */
zend_result dom_namednodemap_length_read(dom_object *obj, zval *retval);

27
ext/dom/entityreference.c
View File

@@ -80,14 +80,9 @@ xmlEntityPtr dom_entity_reference_fetch_and_sync_declaration(xmlNodePtr referenc
return entity;
}
int dom_entity_reference_child_read(dom_object *obj, zval *retval)
zend_result dom_entity_reference_child_read(dom_object *obj, zval *retval)
{
xmlNodePtr nodep = dom_object_get_node(obj);
if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, true);
return FAILURE;
}
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
xmlEntityPtr entity = dom_entity_reference_fetch_and_sync_declaration(nodep);
if (entity == NULL) {
@@ -99,27 +94,17 @@ int dom_entity_reference_child_read(dom_object *obj, zval *retval)
return SUCCESS;
}
int dom_entity_reference_text_content_read(dom_object *obj, zval *retval)
zend_result dom_entity_reference_text_content_read(dom_object *obj, zval *retval)
{
xmlNodePtr nodep = dom_object_get_node(obj);
if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, true);
return FAILURE;
}
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
dom_entity_reference_fetch_and_sync_declaration(nodep);
return dom_node_text_content_read(obj, retval);
}
int dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval)
zend_result dom_entity_reference_child_nodes_read(dom_object *obj, zval *retval)
{
xmlNodePtr nodep = dom_object_get_node(obj);
if (nodep == NULL) {
php_dom_throw_error(INVALID_STATE_ERR, true);
return FAILURE;
}
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
dom_entity_reference_fetch_and_sync_declaration(nodep);
return dom_node_child_nodes_read(obj, retval);