From c6bffff96bf46a4345a5d2a8c526bdc8a7bdd3aa Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sat, 3 Jun 2023 00:19:28 +0200 Subject: [PATCH] Remove dead code from sxe_get_element_by_name() retnode will never be set to anything other than NULL, because the branch is always taken if the names match. --- ext/simplexml/simplexml.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index e0340b2e3a6..26c77e35b93 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -165,7 +165,6 @@ static xmlNodePtr sxe_get_element_by_name(php_sxe_object *sxe, xmlNodePtr node, { int orgtype; xmlNodePtr orgnode = node; - xmlNodePtr retnode = NULL; if (sxe->iter.type != SXE_ITER_ATTRLIST) { @@ -189,25 +188,14 @@ static xmlNodePtr sxe_get_element_by_name(php_sxe_object *sxe, xmlNodePtr node, SKIP_TEXT(node) if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) { if (!xmlStrcmp(node->name, (xmlChar *)*name)) { - if (1||retnode) - { - *type = SXE_ITER_ELEMENT; - return orgnode; - } - retnode = node; + *type = SXE_ITER_ELEMENT; + return orgnode; } } next_iter: node = node->next; } - if (retnode) - { - *type = SXE_ITER_NONE; - *name = NULL; - return retnode; - } - return NULL; } /* }}} */