Skip to content

Commit 9979f47

Browse files
nielsdosnielsdos
committed
Remove unused parameter from match_ns()
1 parent 2fe8dd1 commit 9979f47

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎ext/simplexml/simplexml.c

+22-22
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static xmlNodePtr php_sxe_get_first_node_non_destructive(php_sxe_object *sxe, xm
9696
}
9797
}
9898

99-
static inline int match_ns(php_sxe_object *sxe, xmlNodePtr node, const zend_string *name, int prefix) /* {{{ */
99+
static inline int match_ns(xmlNodePtr node, const zend_string *name, int prefix) /* {{{ */
100100
{
101101
if (name == NULL && (node->ns == NULL || node->ns->prefix == NULL)) {
102102
return 1;
@@ -125,7 +125,7 @@ static xmlNodePtr sxe_get_element_by_offset(php_sxe_object *sxe, zend_long offse
125125
}
126126
}
127127
while (node && nodendx <= offset) {
128-
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
128+
if (node->type == XML_ELEMENT_NODE && match_ns(node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
129129
if (sxe->iter.type == SXE_ITER_CHILD || (
130130
sxe->iter.type == SXE_ITER_ELEMENT && xmlStrEqual(node->name, BAD_CAST ZSTR_VAL(sxe->iter.name)))) {
131131
if (nodendx == offset) {
@@ -149,7 +149,7 @@ static xmlNodePtr sxe_find_element_by_name(php_sxe_object *sxe, xmlNodePtr node,
149149
{
150150
const xmlChar *raw_name = BAD_CAST ZSTR_VAL(name);
151151
while (node) {
152-
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
152+
if (node->type == XML_ELEMENT_NODE && match_ns(node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
153153
if (xmlStrEqual(node->name, raw_name)) {
154154
return node;
155155
}
@@ -183,7 +183,7 @@ static xmlNodePtr sxe_get_element_by_name(php_sxe_object *sxe, xmlNodePtr node,
183183
}
184184

185185
while (node) {
186-
if (node->type == XML_ELEMENT_NODE && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
186+
if (node->type == XML_ELEMENT_NODE && match_ns(node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
187187
if (xmlStrEqual(node->name, (xmlChar *)name)) {
188188
*type = SXE_ITER_ELEMENT;
189189
return orgnode;
@@ -265,7 +265,7 @@ static zval *sxe_prop_dim_read(zend_object *object, zval *member, bool elements,
265265
if (Z_TYPE_P(member) != IS_LONG || sxe->iter.type == SXE_ITER_ATTRLIST) {
266266
if (Z_TYPE_P(member) == IS_LONG) {
267267
while (attr && nodendx <= Z_LVAL_P(member)) {
268-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
268+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
269269
if (nodendx == Z_LVAL_P(member)) {
270270
node_as_zval(sxe, (xmlNodePtr) attr, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
271271
break;
@@ -276,7 +276,7 @@ static zval *sxe_prop_dim_read(zend_object *object, zval *member, bool elements,
276276
}
277277
} else {
278278
while (attr) {
279-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(name)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
279+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(name)) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
280280
node_as_zval(sxe, (xmlNodePtr) attr, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
281281
break;
282282
}
@@ -491,7 +491,7 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value,
491491
if (attribs) {
492492
if (Z_TYPE_P(member) == IS_LONG) {
493493
while (attr && nodendx <= Z_LVAL_P(member)) {
494-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
494+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
495495
if (nodendx == Z_LVAL_P(member)) {
496496
is_attr = 1;
497497
++counter;
@@ -503,7 +503,7 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value,
503503
}
504504
} else {
505505
while (attr) {
506-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
506+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
507507
is_attr = 1;
508508
++counter;
509509
break;
@@ -542,7 +542,7 @@ static zval *sxe_prop_dim_write(zend_object *object, zval *member, zval *value,
542542
while (node) {
543543
SKIP_TEXT(node);
544544

545-
if (xmlStrEqual(node->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
545+
if (xmlStrEqual(node->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
546546
newnode = node;
547547
++counter;
548548
}
@@ -707,7 +707,7 @@ static int sxe_prop_dim_exists(zend_object *object, zval *member, int check_empt
707707
int nodendx = 0;
708708

709709
while (attr && nodendx <= Z_LVAL_P(member)) {
710-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
710+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
711711
if (nodendx == Z_LVAL_P(member)) {
712712
exists = 1;
713713
break;
@@ -718,7 +718,7 @@ static int sxe_prop_dim_exists(zend_object *object, zval *member, int check_empt
718718
}
719719
} else {
720720
while (attr) {
721-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
721+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
722722
exists = 1;
723723
break;
724724
}
@@ -831,7 +831,7 @@ static void sxe_prop_dim_delete(zend_object *object, zval *member, bool elements
831831
int nodendx = 0;
832832

833833
while (attr && nodendx <= Z_LVAL_P(member)) {
834-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
834+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
835835
if (nodendx == Z_LVAL_P(member)) {
836836
xmlUnlinkNode((xmlNodePtr) attr);
837837
php_libxml_node_free_resource((xmlNodePtr) attr);
@@ -844,7 +844,7 @@ static void sxe_prop_dim_delete(zend_object *object, zval *member, bool elements
844844
} else {
845845
while (attr) {
846846
anext = attr->next;
847-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
847+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && xmlStrEqual(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns((xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
848848
xmlUnlinkNode((xmlNodePtr) attr);
849849
php_libxml_node_free_resource((xmlNodePtr) attr);
850850
break;
@@ -871,7 +871,7 @@ static void sxe_prop_dim_delete(zend_object *object, zval *member, bool elements
871871

872872
SKIP_TEXT(node);
873873

874-
if (xmlStrEqual(node->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
874+
if (xmlStrEqual(node->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(node, sxe->iter.nsprefix, sxe->iter.isprefix)) {
875875
xmlUnlinkNode(node);
876876
php_libxml_node_free_resource(node);
877877
}
@@ -995,7 +995,7 @@ static int sxe_prop_is_empty(zend_object *object) /* {{{ */
995995
attr = node->properties;
996996
test = sxe->iter.name && sxe->iter.type == SXE_ITER_ATTRLIST;
997997
while (attr) {
998-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns(sxe, (xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
998+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns((xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
999999
return 0;
10001000
}
10011001
attr = attr->next;
@@ -1031,7 +1031,7 @@ static int sxe_prop_is_empty(zend_object *object) /* {{{ */
10311031
}
10321032
}
10331033

1034-
if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix))) {
1034+
if (node->type == XML_ELEMENT_NODE && (! match_ns(node, sxe->iter.nsprefix, sxe->iter.isprefix))) {
10351035
goto next_iter;
10361036
}
10371037

@@ -1092,7 +1092,7 @@ static HashTable *sxe_get_prop_hash(zend_object *object, int is_debug) /* {{{ */
10921092
ZVAL_UNDEF(&zattr);
10931093
test = sxe->iter.name && sxe->iter.type == SXE_ITER_ATTRLIST;
10941094
while (attr) {
1095-
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns(sxe, (xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
1095+
if ((!test || xmlStrEqual(attr->name, BAD_CAST ZSTR_VAL(sxe->iter.name))) && match_ns((xmlNodePtr)attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
10961096
ZVAL_STR(&value, sxe_xmlNodeListGetString((xmlDocPtr) sxe->document->ptr, attr->children, 1));
10971097
namelen = xmlStrlen(attr->name);
10981098
if (Z_ISUNDEF(zattr)) {
@@ -1138,7 +1138,7 @@ static HashTable *sxe_get_prop_hash(zend_object *object, int is_debug) /* {{{ */
11381138
}
11391139
}
11401140

1141-
if (node->type == XML_ELEMENT_NODE && (! match_ns(sxe, node, sxe->iter.nsprefix, sxe->iter.isprefix))) {
1141+
if (node->type == XML_ELEMENT_NODE && (! match_ns(node, sxe->iter.nsprefix, sxe->iter.isprefix))) {
11421142
goto next_iter;
11431143
}
11441144

@@ -2361,7 +2361,7 @@ static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, i
23612361
if (sxe->iter.name) {
23622362
while (node) {
23632363
if (node->type == XML_ATTRIBUTE_NODE) {
2364-
if (xmlStrEqual(node->name, BAD_CAST ZSTR_VAL(sxe->iter.name)) && match_ns(sxe, node, prefix, isprefix)) {
2364+
if (xmlStrEqual(node->name, BAD_CAST ZSTR_VAL(sxe->iter.name)) && match_ns(node, prefix, isprefix)) {
23652365
break;
23662366
}
23672367
}
@@ -2370,7 +2370,7 @@ static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, i
23702370
} else {
23712371
while (node) {
23722372
if (node->type == XML_ATTRIBUTE_NODE) {
2373-
if (match_ns(sxe, node, prefix, isprefix)) {
2373+
if (match_ns(node, prefix, isprefix)) {
23742374
break;
23752375
}
23762376
}
@@ -2380,7 +2380,7 @@ static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, i
23802380
} else if (sxe->iter.type == SXE_ITER_ELEMENT && sxe->iter.name) {
23812381
while (node) {
23822382
if (node->type == XML_ELEMENT_NODE) {
2383-
if (xmlStrEqual(node->name, BAD_CAST ZSTR_VAL(sxe->iter.name)) && match_ns(sxe, node, prefix, isprefix)) {
2383+
if (xmlStrEqual(node->name, BAD_CAST ZSTR_VAL(sxe->iter.name)) && match_ns(node, prefix, isprefix)) {
23842384
break;
23852385
}
23862386
}
@@ -2389,7 +2389,7 @@ static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, i
23892389
} else {
23902390
while (node) {
23912391
if (node->type == XML_ELEMENT_NODE) {
2392-
if (match_ns(sxe, node, prefix, isprefix)) {
2392+
if (match_ns(node, prefix, isprefix)) {
23932393
break;
23942394
}
23952395
}

0 commit comments

Comments
 (0)