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

Remove useless SKIP_TEXT() invokes (#12164)

Browse Source 
In the places I removed them, they were useless because there is already
a type check for a single node type, so I found it confusing having them
there.
This commit is contained in:
Niels Dossche
2023-09-10 00:02:17 +02:00
committed by GitHub
parent d18bab5562
commit bec1552a06
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/simplexml/simplexml.c
View File

@@ -123,7 +123,6 @@ static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, zend_long offse
}
}
while (node && nodendx <= offset) {
SKIP_TEXT(node)
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
if (sxe->iter.type == SXE_ITER_CHILD || (
sxe->iter.type == SXE_ITER_ELEMENT && xmlStrEqual(node->name, sxe->iter.name))) {
@@ -133,7 +132,6 @@ static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, zend_long offse
nodendx++;
}
}
next_iter:
node = node->next;
}
@@ -148,13 +146,11 @@ next_iter:
static xmlNodePtr sxe_find_element_by_name(php_sxe_object *sxe, xmlNodePtr node, xmlChar *name) /* {{{ */
{
while (node) {
SKIP_TEXT(node)
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
if (xmlStrEqual(node->name, name)) {
return node;
}
}
next_iter:
node = node->next;
}
return NULL;
@@ -184,14 +180,12 @@ static xmlNodePtr sxe_get_element_by_name(php_sxe_object *sxe, xmlNodePtr node,
}
while (node) {
SKIP_TEXT(node)
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
if (xmlStrEqual(node->name, (xmlChar *)name)) {
*type = SXE_ITER_ELEMENT;
return orgnode;
}
}
next_iter:
node = node->next;
}