From e95b06c5adf3111167f771c8039004e1adc5b1e9 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sun, 12 May 2024 22:27:51 +0200 Subject: [PATCH] Make some more arguments const --- ext/dom/parentnode.c | 4 ++-- ext/dom/php_dom.c | 6 ++---- ext/dom/php_dom.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ext/dom/parentnode.c b/ext/dom/parentnode.c index afc87c6495e..3969ee5e970 100644 --- a/ext/dom/parentnode.c +++ b/ext/dom/parentnode.c @@ -108,7 +108,7 @@ zend_result dom_parent_node_child_element_count(dom_object *obj, zval *retval) } /* }}} */ -static bool dom_is_node_in_list(const zval *nodes, uint32_t nodesc, const xmlNodePtr node_to_find) +static bool dom_is_node_in_list(const zval *nodes, uint32_t nodesc, const xmlNode *node_to_find) { for (uint32_t i = 0; i < nodesc; i++) { if (Z_TYPE(nodes[i]) == IS_OBJECT) { @@ -691,7 +691,7 @@ void dom_parent_node_before(dom_object *context, zval *nodes, uint32_t nodesc) php_dom_pre_insert(context->document, fragment, parentNode, viable_previous_sibling); } -static zend_result dom_child_removal_preconditions(const xmlNodePtr child, int stricterror) +static zend_result dom_child_removal_preconditions(const xmlNode *child, int stricterror) { if (dom_node_is_read_only(child) == SUCCESS || (child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) { diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 5ce0133763c..0f2d2b67f51 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -146,8 +146,7 @@ typedef struct _dom_prop_handler { dom_write_t write_func; } dom_prop_handler; -/* {{{ int dom_node_is_read_only(xmlNodePtr node) */ -int dom_node_is_read_only(xmlNodePtr node) { +int dom_node_is_read_only(const xmlNode *node) { switch (node->type) { case XML_ENTITY_REF_NODE: case XML_ENTITY_NODE: @@ -168,9 +167,8 @@ int dom_node_is_read_only(xmlNodePtr node) { } } } -/* }}} end dom_node_is_read_only */ -bool dom_node_children_valid(xmlNodePtr node) { +bool dom_node_children_valid(const xmlNode *node) { switch (node->type) { case XML_DOCUMENT_TYPE_NODE: case XML_DTD_NODE: diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 77416aae5e2..1e24b38a648 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -145,8 +145,8 @@ xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr basep, xmlNodePtr nodep, void php_dom_create_implementation(zval *retval, bool modern); int dom_hierarchy(xmlNodePtr parent, xmlNodePtr child); bool dom_has_feature(zend_string *feature, zend_string *version); -int dom_node_is_read_only(xmlNodePtr node); -bool dom_node_children_valid(xmlNodePtr node); +int dom_node_is_read_only(const xmlNode *node); +bool dom_node_children_valid(const xmlNode *node); void php_dom_create_iterator(zval *return_value, dom_iterator_type iterator_type, bool modern); void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, const char *local, size_t local_len, const char *ns, size_t ns_len); xmlNodePtr create_notation(const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID);