From 83889b4524cc13298782da43f277554d3c04b457 Mon Sep 17 00:00:00 2001 From: nielsdos <7771979+nielsdos@users.noreply.github.com> Date: Wed, 7 Jun 2023 23:44:54 +0200 Subject: [PATCH] Get rid of return value for php_libxml_unregister_node() --- ext/libxml/libxml.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 5af3443069aba..d12c215367c3c 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -113,7 +113,7 @@ static int php_libxml_clear_object(php_libxml_node_object *object) return php_libxml_decrement_doc_ref(object); } -static int php_libxml_unregister_node(xmlNodePtr nodep) +static void php_libxml_unregister_node(xmlNodePtr nodep) { php_libxml_node_object *wrapper; @@ -130,8 +130,6 @@ static int php_libxml_unregister_node(xmlNodePtr nodep) nodeptr->node = NULL; } } - - return -1; } static void php_libxml_node_free(xmlNodePtr node) @@ -209,9 +207,7 @@ PHP_LIBXML_API void php_libxml_node_free_list(xmlNodePtr node) curnode = node->next; xmlUnlinkNode(node); - if (php_libxml_unregister_node(node) == 0) { - node->doc = NULL; - } + php_libxml_unregister_node(node); php_libxml_node_free(node); } } @@ -1270,9 +1266,7 @@ PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node) default: php_libxml_node_free_list((xmlNodePtr) node->properties); } - if (php_libxml_unregister_node(node) == 0) { - node->doc = NULL; - } + php_libxml_unregister_node(node); php_libxml_node_free(node); } else { php_libxml_unregister_node(node);