archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove properties field from php_libxml_node_object (#13062)

Browse source 
This shrinks the struct from 80 bytes to 72 bytes.
This was unused internally, I did not find users externally via GitHub
search.
The intention for this was that it could be used for attaching extra
data as a 3rd party to a node. However, there are better mechanisms for
that like using actual objects.
This commit is contained in:
Niels Dossche 2024-01-03 20:03:56 +01:00 • committed by GitHub
parent 96ee0787cf
commit 03547f6832
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
UPGRADING.INTERNALS
View file

@ -55,6 +55,7 @@ PHP 8.4 INTERNALS UPGRADE NOTES
d. ext/libxml d. ext/libxml
- Added php_libxml_pretend_ctx_error_ex() to emit errors as if they had come - Added php_libxml_pretend_ctx_error_ex() to emit errors as if they had come
from libxml. from libxml.
- Removed the "properties" HashTable field from php_libxml_node_object.
e. ext/date e. ext/date
- Added the php_format_date_ex() API to format instances of php_date_obj. - Added the php_format_date_ex() API to format instances of php_date_obj.

12
ext/libxml/libxml.c
View file

@ -152,15 +152,6 @@ static void php_libxml_unlink_entity(void *data, void *table, xmlChar *name)
} }
/* {{{ internal functions for interoperability */ /* {{{ internal functions for interoperability */
static int php_libxml_clear_object(php_libxml_node_object *object)
{
if (object->properties) {
object->properties = NULL;
}
php_libxml_decrement_node_ptr(object);
return php_libxml_decrement_doc_ref(object);
}
static void php_libxml_unregister_node(xmlNodePtr nodep) static void php_libxml_unregister_node(xmlNodePtr nodep)
{ {
php_libxml_node_object *wrapper; php_libxml_node_object *wrapper;
@ -170,7 +161,8 @@ static void php_libxml_unregister_node(xmlNodePtr nodep)
if (nodeptr != NULL) { if (nodeptr != NULL) {
wrapper = nodeptr->_private; wrapper = nodeptr->_private;
if (wrapper) { if (wrapper) {
php_libxml_clear_object(wrapper); php_libxml_decrement_node_ptr(wrapper);
php_libxml_decrement_doc_ref(wrapper);
} else { } else {
if (nodeptr->node != NULL && nodeptr->node->type != XML_DOCUMENT_NODE) { if (nodeptr->node != NULL && nodeptr->node->type != XML_DOCUMENT_NODE) {
nodeptr->node->_private = NULL; nodeptr->node->_private = NULL;

1
ext/libxml/php_libxml.h
View file

@ -79,7 +79,6 @@ typedef struct _php_libxml_node_ptr {
typedef struct _php_libxml_node_object { typedef struct _php_libxml_node_object {
php_libxml_node_ptr *node; php_libxml_node_ptr *node;
php_libxml_ref_obj *document; php_libxml_ref_obj *document;
HashTable *properties;
zend_object std; zend_object std;
} php_libxml_node_object; } php_libxml_node_object;