Skip to content

Commit acda7ed

Browse files
ndosschendossche
committed
Stop using reserved names in simplexml
1 parent c6d0181 commit acda7ed

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎ext/simplexml/simplexml.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ static void php_sxe_iterator_move_forward(zend_object_iterator *iter);
5353
static void php_sxe_iterator_rewind(zend_object_iterator *iter);
5454
static zend_result sxe_object_cast_ex(zend_object *readobj, zval *writeobj, int type);
5555

56-
/* {{{ _node_as_zval() */
57-
static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE_ITER itertype, char *name, const xmlChar *nsprefix, int isprefix)
56+
/* {{{ node_as_zval() */
57+
static void node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE_ITER itertype, char *name, const xmlChar *nsprefix, int isprefix)
5858
{
5959
php_sxe_object *subnode;
6060

@@ -255,7 +255,7 @@ static zval *sxe_prop_dim_read(zend_object *object, zval *member, bool elements,
255255
while (attr && nodendx <= Z_LVAL_P(member)) {
256256
if ((!test || xmlStrEqual(attr->name, sxe->iter.name)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
257257
if (nodendx == Z_LVAL_P(member)) {
258-
_node_as_zval(sxe, (xmlNodePtr) attr, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
258+
node_as_zval(sxe, (xmlNodePtr) attr, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
259259
break;
260260
}
261261
nodendx++;
@@ -265,7 +265,7 @@ static zval *sxe_prop_dim_read(zend_object *object, zval *member, bool elements,
265265
} else {
266266
while (attr) {
267267
if ((!test || xmlStrEqual(attr->name, sxe->iter.name)) && xmlStrEqual(attr->name, (xmlChar *)name) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
268-
_node_as_zval(sxe, (xmlNodePtr) attr, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
268+
node_as_zval(sxe, (xmlNodePtr) attr, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
269269
break;
270270
}
271271
attr = attr->next;
@@ -295,18 +295,18 @@ static zval *sxe_prop_dim_read(zend_object *object, zval *member, bool elements,
295295
node = NULL;
296296
}
297297
if (node) {
298-
_node_as_zval(sxe, node, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
298+
node_as_zval(sxe, node, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
299299
} else if (type == BP_VAR_W || type == BP_VAR_RW) {
300300
if (member && cnt < Z_LVAL_P(member)) {
301301
php_error_docref(NULL, E_WARNING, "Cannot add element %s number " ZEND_LONG_FMT " when only " ZEND_LONG_FMT " such elements exist", mynode->name, Z_LVAL_P(member), cnt);
302302
}
303303
node = xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, NULL);
304-
_node_as_zval(sxe, node, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
304+
node_as_zval(sxe, node, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
305305
}
306306
} else {
307307
/* In BP_VAR_IS mode only return a proper node if it actually exists. */
308308
if (type != BP_VAR_IS || sxe_find_element_by_name(sxe, node->children, (xmlChar *) name)) {
309-
_node_as_zval(sxe, node, rv, SXE_ITER_ELEMENT, name, sxe->iter.nsprefix, sxe->iter.isprefix);
309+
node_as_zval(sxe, node, rv, SXE_ITER_ELEMENT, name, sxe->iter.nsprefix, sxe->iter.isprefix);
310310
}
311311
}
312312
}
@@ -633,7 +633,7 @@ static zval *sxe_property_get_adr(zend_object *object, zend_string *zname, int f
633633
type = SXE_ITER_NONE;
634634
name = NULL;
635635

636-
_node_as_zval(sxe, node, &ret, type, name, sxe->iter.nsprefix, sxe->iter.isprefix);
636+
node_as_zval(sxe, node, &ret, type, name, sxe->iter.nsprefix, sxe->iter.isprefix);
637637

638638
if (!Z_ISUNDEF(sxe->tmp)) {
639639
zval_ptr_dtor(&sxe->tmp);
@@ -910,8 +910,8 @@ static inline zend_string *sxe_xmlNodeListGetString(xmlDocPtr doc, xmlNodePtr li
910910
}
911911
/* }}} */
912912

913-
/* {{{ _get_base_node_value() */
914-
static void _get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval *value, xmlChar *nsprefix, int isprefix)
913+
/* {{{ get_base_node_value() */
914+
static void get_base_node_value(php_sxe_object *sxe_ref, xmlNodePtr node, zval *value, xmlChar *nsprefix, int isprefix)
915915
{
916916
php_sxe_object *subnode;
917917
xmlChar *contents;
@@ -1138,7 +1138,7 @@ static HashTable *sxe_get_prop_hash(zend_object *object, int is_debug) /* {{{ */
11381138
namelen = xmlStrlen(node->name);
11391139
}
11401140

1141-
_get_base_node_value(sxe, node, &value, sxe->iter.nsprefix, sxe->iter.isprefix);
1141+
get_base_node_value(sxe, node, &value, sxe->iter.nsprefix, sxe->iter.isprefix);
11421142

11431143
if ( use_iter ) {
11441144
zend_hash_next_index_insert(rv, &value);
@@ -1289,11 +1289,11 @@ PHP_METHOD(SimpleXMLElement, xpath)
12891289
* to the parent node.
12901290
*/
12911291
if (nodeptr->type == XML_TEXT_NODE) {
1292-
_node_as_zval(sxe, nodeptr->parent, &value, SXE_ITER_NONE, NULL, NULL, 0);
1292+
node_as_zval(sxe, nodeptr->parent, &value, SXE_ITER_NONE, NULL, NULL, 0);
12931293
} else if (nodeptr->type == XML_ATTRIBUTE_NODE) {
1294-
_node_as_zval(sxe, nodeptr->parent, &value, SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? (xmlChar *)nodeptr->ns->href : NULL, 0);
1294+
node_as_zval(sxe, nodeptr->parent, &value, SXE_ITER_ATTRLIST, (char*)nodeptr->name, nodeptr->ns ? (xmlChar *)nodeptr->ns->href : NULL, 0);
12951295
} else {
1296-
_node_as_zval(sxe, nodeptr, &value, SXE_ITER_NONE, NULL, NULL, 0);
1296+
node_as_zval(sxe, nodeptr, &value, SXE_ITER_NONE, NULL, NULL, 0);
12971297
}
12981298

12991299
add_next_index_zval(return_value, &value);
@@ -1586,7 +1586,7 @@ PHP_METHOD(SimpleXMLElement, children)
15861586
return;
15871587
}
15881588

1589-
_node_as_zval(sxe, node, return_value, SXE_ITER_CHILD, NULL, (xmlChar *)nsprefix, isprefix);
1589+
node_as_zval(sxe, node, return_value, SXE_ITER_CHILD, NULL, (xmlChar *)nsprefix, isprefix);
15901590

15911591
}
15921592
/* }}} */
@@ -1639,7 +1639,7 @@ PHP_METHOD(SimpleXMLElement, attributes)
16391639
return; /* attributes don't have attributes */
16401640
}
16411641

1642-
_node_as_zval(sxe, node, return_value, SXE_ITER_ATTRLIST, NULL, (xmlChar *)nsprefix, isprefix);
1642+
node_as_zval(sxe, node, return_value, SXE_ITER_ATTRLIST, NULL, (xmlChar *)nsprefix, isprefix);
16431643
}
16441644
/* }}} */
16451645

@@ -1700,7 +1700,7 @@ PHP_METHOD(SimpleXMLElement, addChild)
17001700
}
17011701
}
17021702

1703-
_node_as_zval(sxe, newnode, return_value, SXE_ITER_NONE, (char *)localname, prefix, 0);
1703+
node_as_zval(sxe, newnode, return_value, SXE_ITER_NONE, (char *)localname, prefix, 0);
17041704

17051705
xmlFree(localname);
17061706
if (prefix != NULL) {
@@ -2394,7 +2394,7 @@ static xmlNodePtr php_sxe_iterator_fetch(php_sxe_object *sxe, xmlNodePtr node, i
23942394
}
23952395

23962396
if (node && use_data) {
2397-
_node_as_zval(sxe, node, &sxe->iter.data, SXE_ITER_NONE, NULL, prefix, isprefix);
2397+
node_as_zval(sxe, node, &sxe->iter.data, SXE_ITER_NONE, NULL, prefix, isprefix);
23982398
}
23992399

24002400
return node;

0 commit comments

Comments
 (0)