Skip to content

Commit c6bffff

Browse files
nielsdosGirgias
authored andcommitted
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.
1 parent 5fae4b5 commit c6bffff

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

ext/simplexml/simplexml.c

+2-14
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ static xmlNodePtr sxe_get_element_by_name(php_sxe_object *sxe, xmlNodePtr node,
165165
{
166166
int orgtype;
167167
xmlNodePtr orgnode = node;
168-
xmlNodePtr retnode = NULL;
169168

170169
if (sxe->iter.type != SXE_ITER_ATTRLIST)
171170
{
@@ -189,25 +188,14 @@ static xmlNodePtr sxe_get_element_by_name(php_sxe_object *sxe, xmlNodePtr node,
189188
SKIP_TEXT(node)
190189
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
191190
if (!xmlStrcmp(node->name, (xmlChar *)*name)) {
192-
if (1||retnode)
193-
{
194-
*type = SXE_ITER_ELEMENT;
195-
return orgnode;
196-
}
197-
retnode = node;
191+
*type = SXE_ITER_ELEMENT;
192+
return orgnode;
198193
}
199194
}
200195
next_iter:
201196
node = node->next;
202197
}
203198

204-
if (retnode)
205-
{
206-
*type = SXE_ITER_NONE;
207-
*name = NULL;
208-
return retnode;
209-
}
210-
211199
return NULL;
212200
}
213201
/* }}} */

0 commit comments

Comments
 (0)