@@ -373,9 +373,9 @@ void php_dom_obj_map_get_item_into_zval(dom_nnodemap_object *objmap, zend_long i
373
373
}
374
374
}
375
375
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 )
377
377
{
378
- xmlNodePtr itemnode = objmap -> handler -> get_named_item (objmap , named , ns );
378
+ xmlNodePtr itemnode = objmap -> handler -> get_ns_named_item (objmap , named , ns );
379
379
if (itemnode ) {
380
380
DOM_RET_OBJ (itemnode , objmap -> baseobj );
381
381
} else {
@@ -387,17 +387,17 @@ void php_dom_obj_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const
387
387
* === Named item === *
388
388
**********************/
389
389
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 )
391
391
{
392
392
return xmlHashLookup (map -> ht , BAD_CAST ZSTR_VAL (named ));
393
393
}
394
394
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 )
396
396
{
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 ;
398
398
}
399
399
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 )
401
401
{
402
402
xmlNotationPtr notation = xmlHashLookup (map -> ht , BAD_CAST ZSTR_VAL (named ));
403
403
if (notation ) {
@@ -406,7 +406,7 @@ static xmlNodePtr dom_map_get_named_item_notation(dom_nnodemap_object *map, cons
406
406
return NULL ;
407
407
}
408
408
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 )
410
410
{
411
411
xmlNodePtr nodep = dom_object_get_node (map -> baseobj );
412
412
if (nodep ) {
@@ -423,17 +423,17 @@ static xmlNodePtr dom_map_get_named_item_prop(dom_nnodemap_object *map, const ze
423
423
return NULL ;
424
424
}
425
425
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 )
427
427
{
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 ;
429
429
}
430
430
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 )
432
432
{
433
433
return NULL ;
434
434
}
435
435
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 )
437
437
{
438
438
return false;
439
439
}
@@ -445,71 +445,71 @@ static bool dom_map_has_named_item_null(dom_nnodemap_object *map, const zend_str
445
445
const php_dom_obj_map_handler php_dom_obj_map_attributes = {
446
446
.length = dom_map_get_prop_length ,
447
447
.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 ,
450
450
.use_cache = false,
451
451
.nameless = false,
452
452
};
453
453
454
454
const php_dom_obj_map_handler php_dom_obj_map_by_tag_name = {
455
455
.length = dom_map_get_by_tag_name_length ,
456
456
.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 ,
459
459
.use_cache = true,
460
460
.nameless = true,
461
461
};
462
462
463
463
const php_dom_obj_map_handler php_dom_obj_map_child_nodes = {
464
464
.length = dom_map_get_nodes_length ,
465
465
.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 ,
468
468
.use_cache = true,
469
469
.nameless = true,
470
470
};
471
471
472
472
const php_dom_obj_map_handler php_dom_obj_map_nodeset = {
473
473
.length = dom_map_get_nodeset_length ,
474
474
.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 ,
477
477
.use_cache = false,
478
478
.nameless = true,
479
479
};
480
480
481
481
const php_dom_obj_map_handler php_dom_obj_map_entities = {
482
482
.length = dom_map_get_xmlht_length ,
483
483
.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 ,
486
486
.use_cache = false,
487
487
.nameless = false,
488
488
};
489
489
490
490
const php_dom_obj_map_handler php_dom_obj_map_notations = {
491
491
.length = dom_map_get_xmlht_length ,
492
492
.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 ,
495
495
.use_cache = false,
496
496
.nameless = false,
497
497
};
498
498
499
499
const php_dom_obj_map_handler php_dom_obj_map_child_elements = {
500
500
.length = dom_map_get_elements_length ,
501
501
.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 ,
504
504
.use_cache = true,
505
505
.nameless = true,
506
506
};
507
507
508
508
const php_dom_obj_map_handler php_dom_obj_map_noop = {
509
509
.length = dom_map_get_zero_length ,
510
510
.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 ,
513
513
.use_cache = false,
514
514
.nameless = true,
515
515
};
0 commit comments