Skip to content

Commit 52280ef

Browse files
ndosschendossche
committed
dom: Rename get_named_item -> get_ns_named_item, and has_named_item -> has_ns_named_item
1 parent f6380e4 commit 52280ef

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
@@ -67,7 +67,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItem)
6767
}
6868

6969
dom_nnodemap_object *objmap = Z_DOMOBJ_P(ZEND_THIS)->ptr;
70-
php_dom_obj_map_get_named_item_into_zval(objmap, named, NULL, return_value);
70+
php_dom_obj_map_get_ns_named_item_into_zval(objmap, named, NULL, return_value);
7171
}
7272
/* }}} end dom_namednodemap_get_named_item */
7373

@@ -112,7 +112,7 @@ PHP_METHOD(DOMNamedNodeMap, getNamedItemNS)
112112
objmap = (dom_nnodemap_object *)intern->ptr;
113113

114114
if (objmap != NULL) {
115-
php_dom_obj_map_get_named_item_into_zval(objmap, named, uri, return_value);
115+
php_dom_obj_map_get_ns_named_item_into_zval(objmap, named, uri, return_value);
116116
}
117117
}
118118
/* }}} 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
@@ -376,9 +376,9 @@ void php_dom_obj_map_get_item_into_zval(dom_nnodemap_object *objmap, zend_long i
376376
}
377377
}
378378

379-
void php_dom_obj_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const zend_string *named, const char *ns, zval *return_value)
379+
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)
380380
{
381-
xmlNodePtr itemnode = objmap->handler->get_named_item(objmap, named, ns);
381+
xmlNodePtr itemnode = objmap->handler->get_ns_named_item(objmap, named, ns);
382382
if (itemnode) {
383383
DOM_RET_OBJ(itemnode, objmap->baseobj);
384384
} else {
@@ -390,17 +390,17 @@ void php_dom_obj_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const
390390
* === Named item === *
391391
**********************/
392392

393-
static xmlNodePtr dom_map_get_named_item_entity(dom_nnodemap_object *map, const zend_string *named, const char *ns)
393+
static xmlNodePtr dom_map_get_ns_named_item_entity(dom_nnodemap_object *map, const zend_string *named, const char *ns)
394394
{
395395
return xmlHashLookup(map->ht, BAD_CAST ZSTR_VAL(named));
396396
}
397397

398-
static bool dom_map_has_named_item_xmlht(dom_nnodemap_object *map, const zend_string *named, const char *ns)
398+
static bool dom_map_has_ns_named_item_xmlht(dom_nnodemap_object *map, const zend_string *named, const char *ns)
399399
{
400-
return dom_map_get_named_item_entity(map, named, ns) != NULL;
400+
return dom_map_get_ns_named_item_entity(map, named, ns) != NULL;
401401
}
402402

403-
static xmlNodePtr dom_map_get_named_item_notation(dom_nnodemap_object *map, const zend_string *named, const char *ns)
403+
static xmlNodePtr dom_map_get_ns_named_item_notation(dom_nnodemap_object *map, const zend_string *named, const char *ns)
404404
{
405405
xmlNotationPtr notation = xmlHashLookup(map->ht, BAD_CAST ZSTR_VAL(named));
406406
if (notation) {
@@ -409,7 +409,7 @@ static xmlNodePtr dom_map_get_named_item_notation(dom_nnodemap_object *map, cons
409409
return NULL;
410410
}
411411

412-
static xmlNodePtr dom_map_get_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
412+
static xmlNodePtr dom_map_get_ns_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
413413
{
414414
xmlNodePtr nodep = dom_object_get_node(map->baseobj);
415415
if (nodep) {
@@ -426,17 +426,17 @@ static xmlNodePtr dom_map_get_named_item_prop(dom_nnodemap_object *map, const ze
426426
return NULL;
427427
}
428428

429-
static bool dom_map_has_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
429+
static bool dom_map_has_ns_named_item_prop(dom_nnodemap_object *map, const zend_string *named, const char *ns)
430430
{
431-
return dom_map_get_named_item_prop(map, named, ns) != NULL;
431+
return dom_map_get_ns_named_item_prop(map, named, ns) != NULL;
432432
}
433433

434-
static xmlNodePtr dom_map_get_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
434+
static xmlNodePtr dom_map_get_ns_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
435435
{
436436
return NULL;
437437
}
438438

439-
static bool dom_map_has_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
439+
static bool dom_map_has_ns_named_item_null(dom_nnodemap_object *map, const zend_string *named, const char *ns)
440440
{
441441
return false;
442442
}
@@ -448,71 +448,71 @@ static bool dom_map_has_named_item_null(dom_nnodemap_object *map, const zend_str
448448
const php_dom_obj_map_handler php_dom_obj_map_attributes = {
449449
.length = dom_map_get_prop_length,
450450
.get_item = dom_map_get_attributes_item,
451-
.get_named_item = dom_map_get_named_item_prop,
452-
.has_named_item = dom_map_has_named_item_prop,
451+
.get_ns_named_item = dom_map_get_ns_named_item_prop,
452+
.has_ns_named_item = dom_map_has_ns_named_item_prop,
453453
.use_cache = false,
454454
.nameless = false,
455455
};
456456

457457
const php_dom_obj_map_handler php_dom_obj_map_by_tag_name = {
458458
.length = dom_map_get_by_tag_name_length,
459459
.get_item = dom_map_get_by_tag_name_item,
460-
.get_named_item = dom_map_get_named_item_null,
461-
.has_named_item = dom_map_has_named_item_null,
460+
.get_ns_named_item = dom_map_get_ns_named_item_null,
461+
.has_ns_named_item = dom_map_has_ns_named_item_null,
462462
.use_cache = true,
463463
.nameless = true,
464464
};
465465

466466
const php_dom_obj_map_handler php_dom_obj_map_child_nodes = {
467467
.length = dom_map_get_nodes_length,
468468
.get_item = dom_map_get_nodes_item,
469-
.get_named_item = dom_map_get_named_item_null,
470-
.has_named_item = dom_map_has_named_item_null,
469+
.get_ns_named_item = dom_map_get_ns_named_item_null,
470+
.has_ns_named_item = dom_map_has_ns_named_item_null,
471471
.use_cache = true,
472472
.nameless = true,
473473
};
474474

475475
const php_dom_obj_map_handler php_dom_obj_map_nodeset = {
476476
.length = dom_map_get_nodeset_length,
477477
.get_item = dom_map_get_nodeset_item,
478-
.get_named_item = dom_map_get_named_item_null,
479-
.has_named_item = dom_map_has_named_item_null,
478+
.get_ns_named_item = dom_map_get_ns_named_item_null,
479+
.has_ns_named_item = dom_map_has_ns_named_item_null,
480480
.use_cache = false,
481481
.nameless = true,
482482
};
483483

484484
const php_dom_obj_map_handler php_dom_obj_map_entities = {
485485
.length = dom_map_get_xmlht_length,
486486
.get_item = dom_map_get_entity_item,
487-
.get_named_item = dom_map_get_named_item_entity,
488-
.has_named_item = dom_map_has_named_item_xmlht,
487+
.get_ns_named_item = dom_map_get_ns_named_item_entity,
488+
.has_ns_named_item = dom_map_has_ns_named_item_xmlht,
489489
.use_cache = false,
490490
.nameless = false,
491491
};
492492

493493
const php_dom_obj_map_handler php_dom_obj_map_notations = {
494494
.length = dom_map_get_xmlht_length,
495495
.get_item = dom_map_get_notation_item,
496-
.get_named_item = dom_map_get_named_item_notation,
497-
.has_named_item = dom_map_has_named_item_xmlht,
496+
.get_ns_named_item = dom_map_get_ns_named_item_notation,
497+
.has_ns_named_item = dom_map_has_ns_named_item_xmlht,
498498
.use_cache = false,
499499
.nameless = false,
500500
};
501501

502502
const php_dom_obj_map_handler php_dom_obj_map_child_elements = {
503503
.length = dom_map_get_elements_length,
504504
.get_item = dom_map_get_elements_item,
505-
.get_named_item = dom_map_get_named_item_null,
506-
.has_named_item = dom_map_has_named_item_null,
505+
.get_ns_named_item = dom_map_get_ns_named_item_null,
506+
.has_ns_named_item = dom_map_has_ns_named_item_null,
507507
.use_cache = true,
508508
.nameless = true,
509509
};
510510

511511
const php_dom_obj_map_handler php_dom_obj_map_noop = {
512512
.length = dom_map_get_zero_length,
513513
.get_item = dom_map_get_null_item,
514-
.get_named_item = dom_map_get_named_item_null,
515-
.has_named_item = dom_map_has_named_item_null,
514+
.get_ns_named_item = dom_map_get_ns_named_item_null,
515+
.has_ns_named_item = dom_map_has_ns_named_item_null,
516516
.use_cache = false,
517517
.nameless = true,
518518
};

‎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)