Skip to content

Commit a2d6535

Browse files
ndosschendossche
committed
dom: Rename get_named_item -> get_ns_named_item, and has_named_item -> has_ns_named_item
1 parent 5cacae8 commit a2d6535

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

‎ext/dom/namednodemap.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItem)
6363
}
6464

6565
dom_nnodemap_object *objmap = Z_DOMOBJ_P(ZEND_THIS)->ptr;
66-
php_dom_obj_map_get_named_item_into_zval(objmap, named, NULL, return_value);
66+
php_dom_obj_map_get_ns_named_item_into_zval(objmap, named, NULL, return_value);
6767
}
6868
/* }}} end dom_namednodemap_get_named_item */
6969

@@ -108,7 +108,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItemNS)
108108
objmap = (dom_nnodemap_object *)intern->ptr;
109109

110110
if (objmap != NULL) {
111-
php_dom_obj_map_get_named_item_into_zval(objmap, named, uri, return_value);
111+
php_dom_obj_map_get_ns_named_item_into_zval(objmap, named, uri, return_value);
112112
}
113113
}
114114
/* }}} end dom_namednodemap_get_named_item_ns */

‎ext/dom/obj_map.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ void php_dom_obj_map_get_item_into_zval(dom_nnodemap_object *objmap, zend_long i
373373
}
374374
}
375375

376-
void php_dom_obj_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const zend_string *named, const char *ns, zval *return_value)
376+
void php_dom_obj_map_get_ns_named_item_into_zval(dom_nnodemap_object *objmap, const zend_string *named, const char *ns, zval *return_value)
377377
{
378-
xmlNodePtr itemnode = objmap->handler->get_named_item(objmap, named, ns);
378+
xmlNodePtr itemnode = objmap->handler->get_ns_named_item(objmap, named, ns);
379379
if (itemnode) {
380380
DOM_RET_OBJ(itemnode, objmap->baseobj);
381381
} else {
@@ -387,17 +387,17 @@ void php_dom_obj_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const
387387
* === Named item === *
388388
**********************/
389389

390-
static xmlNodePtr dom_map_get_named_item_entity(dom_nnodemap_object *map, const zend_string *named, const char *ns)
390+
static xmlNodePtr dom_map_get_ns_named_item_entity(dom_nnodemap_object *map, const zend_string *named, const char *ns)
391391
{
392392
return xmlHashLookup(map->ht, BAD_CAST ZSTR_VAL(named));
393393
}
394394

395-
static bool dom_map_has_named_item_xmlht(dom_nnodemap_object *map, const zend_string *named, const char *ns)
395+
static bool dom_map_has_ns_named_item_xmlht(dom_nnodemap_object *map, const zend_string *named, const char *ns)
396396
{
397-
return dom_map_get_named_item_entity(map, named, ns) != NULL;
397+
return dom_map_get_ns_named_item_entity(map, named, ns) != NULL;
398398
}
399399

400-
static xmlNodePtr dom_map_get_named_item_notation(dom_nnodemap_object *map, const zend_string *named, const char *ns)
400+
static xmlNodePtr dom_map_get_ns_named_item_notation(dom_nnodemap_object *map, const zend_string *named, const char *ns)
401401
{
402402
xmlNotationPtr notation = xmlHashLookup(map->ht, BAD_CAST ZSTR_VAL(named));
403403
if (notation) {
@@ -406,7 +406,7 @@ static xmlNodePtr dom_map_get_named_item_notation(dom_nnodemap_object *map, cons
406406
return NULL;
407407
}
408408

409-
static xmlNodePtr dom_map_get_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
409+
static xmlNodePtr dom_map_get_ns_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
410410
{
411411
xmlNodePtr nodep = dom_object_get_node(map->baseobj);
412412
if (nodep) {
@@ -423,17 +423,17 @@ static xmlNodePtr dom_map_get_named_item_prop(dom_nnodemap_object *map, const ze
423423
return NULL;
424424
}
425425

426-
static bool dom_map_has_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
426+
static bool dom_map_has_ns_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
427427
{
428-
return dom_map_get_named_item_prop(map, named, ns) != NULL;
428+
return dom_map_get_ns_named_item_prop(map, named, ns) != NULL;
429429
}
430430

431-
static xmlNodePtr dom_map_get_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
431+
static xmlNodePtr dom_map_get_ns_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
432432
{
433433
return NULL;
434434
}
435435

436-
static bool dom_map_has_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
436+
static bool dom_map_has_ns_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
437437
{
438438
return false;
439439
}
@@ -445,71 +445,71 @@ static bool dom_map_has_named_item_null(dom_nnodemap_object *map, const zend_str
445445
const php_dom_obj_map_handler php_dom_obj_map_attributes = {
446446
.length = dom_map_get_prop_length,
447447
.get_item = dom_map_get_attributes_item,
448-
.get_named_item = dom_map_get_named_item_prop,
449-
.has_named_item = dom_map_has_named_item_prop,
448+
.get_ns_named_item = dom_map_get_ns_named_item_prop,
449+
.has_ns_named_item = dom_map_has_ns_named_item_prop,
450450
.use_cache = false,
451451
.nameless = false,
452452
};
453453

454454
const php_dom_obj_map_handler php_dom_obj_map_by_tag_name = {
455455
.length = dom_map_get_by_tag_name_length,
456456
.get_item = dom_map_get_by_tag_name_item,
457-
.get_named_item = dom_map_get_named_item_null,
458-
.has_named_item = dom_map_has_named_item_null,
457+
.get_ns_named_item = dom_map_get_ns_named_item_null,
458+
.has_ns_named_item = dom_map_has_ns_named_item_null,
459459
.use_cache = true,
460460
.nameless = true,
461461
};
462462

463463
const php_dom_obj_map_handler php_dom_obj_map_child_nodes = {
464464
.length = dom_map_get_nodes_length,
465465
.get_item = dom_map_get_nodes_item,
466-
.get_named_item = dom_map_get_named_item_null,
467-
.has_named_item = dom_map_has_named_item_null,
466+
.get_ns_named_item = dom_map_get_ns_named_item_null,
467+
.has_ns_named_item = dom_map_has_ns_named_item_null,
468468
.use_cache = true,
469469
.nameless = true,
470470
};
471471

472472
const php_dom_obj_map_handler php_dom_obj_map_nodeset = {
473473
.length = dom_map_get_nodeset_length,
474474
.get_item = dom_map_get_nodeset_item,
475-
.get_named_item = dom_map_get_named_item_null,
476-
.has_named_item = dom_map_has_named_item_null,
475+
.get_ns_named_item = dom_map_get_ns_named_item_null,
476+
.has_ns_named_item = dom_map_has_ns_named_item_null,
477477
.use_cache = false,
478478
.nameless = true,
479479
};
480480

481481
const php_dom_obj_map_handler php_dom_obj_map_entities = {
482482
.length = dom_map_get_xmlht_length,
483483
.get_item = dom_map_get_entity_item,
484-
.get_named_item = dom_map_get_named_item_entity,
485-
.has_named_item = dom_map_has_named_item_xmlht,
484+
.get_ns_named_item = dom_map_get_ns_named_item_entity,
485+
.has_ns_named_item = dom_map_has_ns_named_item_xmlht,
486486
.use_cache = false,
487487
.nameless = false,
488488
};
489489

490490
const php_dom_obj_map_handler php_dom_obj_map_notations = {
491491
.length = dom_map_get_xmlht_length,
492492
.get_item = dom_map_get_notation_item,
493-
.get_named_item = dom_map_get_named_item_notation,
494-
.has_named_item = dom_map_has_named_item_xmlht,
493+
.get_ns_named_item = dom_map_get_ns_named_item_notation,
494+
.has_ns_named_item = dom_map_has_ns_named_item_xmlht,
495495
.use_cache = false,
496496
.nameless = false,
497497
};
498498

499499
const php_dom_obj_map_handler php_dom_obj_map_child_elements = {
500500
.length = dom_map_get_elements_length,
501501
.get_item = dom_map_get_elements_item,
502-
.get_named_item = dom_map_get_named_item_null,
503-
.has_named_item = dom_map_has_named_item_null,
502+
.get_ns_named_item = dom_map_get_ns_named_item_null,
503+
.has_ns_named_item = dom_map_has_ns_named_item_null,
504504
.use_cache = true,
505505
.nameless = true,
506506
};
507507

508508
const php_dom_obj_map_handler php_dom_obj_map_noop = {
509509
.length = dom_map_get_zero_length,
510510
.get_item = dom_map_get_null_item,
511-
.get_named_item = dom_map_get_named_item_null,
512-
.has_named_item = dom_map_has_named_item_null,
511+
.get_ns_named_item = dom_map_get_ns_named_item_null,
512+
.has_ns_named_item = dom_map_has_ns_named_item_null,
513513
.use_cache = false,
514514
.nameless = true,
515515
};

‎ext/dom/obj_map.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ typedef struct dom_nnodemap_object dom_nnodemap_object;
2222
typedef struct php_dom_obj_map_handler {
2323
zend_long (*length)(dom_nnodemap_object *);
2424
void (*get_item)(dom_nnodemap_object *, zend_long, zval *);
25-
xmlNodePtr (*get_named_item)(dom_nnodemap_object *, const zend_string *, const char *);
26-
bool (*has_named_item)(dom_nnodemap_object *, const zend_string *, const char *);
25+
xmlNodePtr (*get_ns_named_item)(dom_nnodemap_object *, const zend_string *, const char *);
26+
bool (*has_ns_named_item)(dom_nnodemap_object *, const zend_string *, const char *);
2727
bool use_cache;
2828
bool nameless;
2929
} php_dom_obj_map_handler;
@@ -51,7 +51,7 @@ typedef struct dom_nnodemap_object {
5151
} dom_nnodemap_object;
5252

5353
void php_dom_create_obj_map(dom_object *basenode, dom_object *intern, xmlHashTablePtr ht, zend_string *local, zend_string *ns, const php_dom_obj_map_handler *handler);
54-
void php_dom_obj_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const zend_string *named, const char *ns, zval *return_value);
54+
void php_dom_obj_map_get_ns_named_item_into_zval(dom_nnodemap_object *objmap, const zend_string *named, const char *ns, zval *return_value);
5555
void php_dom_obj_map_get_item_into_zval(dom_nnodemap_object *objmap, zend_long index, zval *return_value);
5656
zend_long php_dom_get_nodelist_length(dom_object *obj);
5757

‎ext/dom/php_dom.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2373,7 +2373,7 @@ static zval *dom_nodemap_read_dimension(zend_object *object, zval *offset, int t
23732373
zend_long lval;
23742374
if (dom_nodemap_or_nodelist_process_offset_as_named(offset, &lval)) {
23752375
/* exceptional case, switch to named lookup */
2376-
php_dom_obj_map_get_named_item_into_zval(php_dom_obj_from_obj(object)->ptr, Z_STR_P(offset), NULL, rv);
2376+
php_dom_obj_map_get_ns_named_item_into_zval(php_dom_obj_from_obj(object)->ptr, Z_STR_P(offset), NULL, rv);
23772377
return rv;
23782378
}
23792379

@@ -2399,7 +2399,7 @@ static int dom_nodemap_has_dimension(zend_object *object, zval *member, int chec
23992399
if (dom_nodemap_or_nodelist_process_offset_as_named(member, &offset)) {
24002400
/* exceptional case, switch to named lookup */
24012401
dom_nnodemap_object *map = php_dom_obj_from_obj(object)->ptr;
2402-
return map->handler->has_named_item(map, Z_STR_P(member), NULL);
2402+
return map->handler->has_ns_named_item(map, Z_STR_P(member), NULL);
24032403
}
24042404

24052405
return offset >= 0 && offset < php_dom_get_namednodemap_length(php_dom_obj_from_obj(object));
@@ -2420,7 +2420,7 @@ static zval *dom_modern_nodemap_read_dimension(zend_object *object, zval *offset
24202420
if (ZEND_HANDLE_NUMERIC(Z_STR_P(offset), lval)) {
24212421
map->handler->get_item(map, (zend_long) lval, rv);
24222422
} else {
2423-
php_dom_obj_map_get_named_item_into_zval(map, Z_STR_P(offset), NULL, rv);
2423+
php_dom_obj_map_get_ns_named_item_into_zval(map, Z_STR_P(offset), NULL, rv);
24242424
}
24252425
} else if (Z_TYPE_P(offset) == IS_LONG) {
24262426
map->handler->get_item(map, Z_LVAL_P(offset), rv);
@@ -2448,7 +2448,7 @@ static int dom_modern_nodemap_has_dimension(zend_object *object, zval *member, i
24482448
if (ZEND_HANDLE_NUMERIC(Z_STR_P(member), lval)) {
24492449
return (zend_long) lval >= 0 && (zend_long) lval < php_dom_get_namednodemap_length(obj);
24502450
} else {
2451-
return map->handler->has_named_item(map, Z_STR_P(member), NULL);
2451+
return map->handler->has_ns_named_item(map, Z_STR_P(member), NULL);
24522452
}
24532453
} else if (Z_TYPE_P(member) == IS_LONG) {
24542454
zend_long offset = Z_LVAL_P(member);

0 commit comments

Comments
 (0)