Skip to content

Commit bec1552

Browse files
authored
Remove useless SKIP_TEXT() invokes (#12164)
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.
1 parent d18bab5 commit bec1552

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

ext/simplexml/simplexml.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, zend_long offse
123123
}
124124
}
125125
while (node && nodendx <= offset) {
126-
SKIP_TEXT(node)
127126
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
128127
if (sxe->iter.type == SXE_ITER_CHILD || (
129128
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
133132
nodendx++;
134133
}
135134
}
136-
next_iter:
137135
node = node->next;
138136
}
139137

@@ -148,13 +146,11 @@ static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, zend_long offse
148146
static xmlNodePtr sxe_find_element_by_name(php_sxe_object *sxe, xmlNodePtr node, xmlChar *name) /* {{{ */
149147
{
150148
while (node) {
151-
SKIP_TEXT(node)
152149
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
153150
if (xmlStrEqual(node->name, name)) {
154151
return node;
155152
}
156153
}
157-
next_iter:
158154
node = node->next;
159155
}
160156
return NULL;
@@ -184,14 +180,12 @@ static xmlNodePtr sxe_get_element_by_name(php_sxe_object *sxe, xmlNodePtr node,
184180
}
185181

186182
while (node) {
187-
SKIP_TEXT(node)
188183
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
189184
if (xmlStrEqual(node->name, (xmlChar *)name)) {
190185
*type = SXE_ITER_ELEMENT;
191186
return orgnode;
192187
}
193188
}
194-
next_iter:
195189
node = node->next;
196190
}
197191

0 commit comments

Comments
 (0)