Reapply "Stop using reserved names in dom"

ndossche · ndossche · commit 882523534855 · 2024-07-08T17:27:39.000+02:00
This reverts commit dda9676.
diff --git a/ext/dom/document.c b/ext/dom/document.c
@@ -1285,7 +1285,7 @@ PHP_METHOD(DOMDocument, __construct)
 }
 /* }}} end DOMDocument::__construct */
 
-const char *_dom_get_valid_file_path(const char *source, char *resolved_path, int resolved_path_len ) /* {{{ */
+const char *dom_get_valid_file_path(const char *source, char *resolved_path, int resolved_path_len ) /* {{{ */
 {
 	xmlURI *uri;
 	xmlChar *escsource;
@@ -1372,7 +1372,7 @@ xmlDocPtr dom_document_parser(zval *id, dom_load_mode mode, const char *source,
 			zend_argument_value_error(1, "must not contain any null bytes");
 			return NULL;
 		}
-		const char *file_dest = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
+		const char *file_dest = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
 		if (file_dest) {
 			ctxt = xmlCreateFileParserCtxt(file_dest);
 		}
@@ -1853,7 +1853,7 @@ PHP_METHOD(DOMDocument, validate)
 /* }}} */
 
 #ifdef LIBXML_SCHEMAS_ENABLED
-static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
+static void dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 {
 	zval *id;
 	xmlDoc *docp;
@@ -1890,7 +1890,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
 			zend_argument_value_error(1, "must not contain any null bytes");
 			RETURN_THROWS();
 		}
-		valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
+		valid_file = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
 		if (!valid_file) {
 			PHP_LIBXML_RESTORE_GLOBALS(new_parser_ctxt);
 			php_error_docref(NULL, E_WARNING, "Invalid Schema file source");
@@ -1953,18 +1953,18 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type
 /* {{{ */
 PHP_METHOD(DOMDocument, schemaValidate)
 {
-	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
+	dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
 /* }}} end dom_document_schema_validate_file */
 
 /* {{{ */
 PHP_METHOD(DOMDocument, schemaValidateSource)
 {
-	_dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
+	dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
 /* }}} end dom_document_schema_validate */
 
-static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
+static void dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
 {
 	zval *id;
 	xmlDoc *docp;
@@ -1996,7 +1996,7 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
 			zend_argument_value_error(1, "must not contain any null bytes");
 			RETURN_THROWS();
 		}
-		valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
+		valid_file = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);
 		if (!valid_file) {
 			php_error_docref(NULL, E_WARNING, "Invalid RelaxNG file source");
 			RETURN_FALSE;
@@ -2050,14 +2050,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ
 /* {{{ */
 PHP_METHOD(DOMDocument, relaxNGValidate)
 {
-	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
+	dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);
 }
 /* }}} end dom_document_relaxNG_validate_file */
 
 /* {{{ */
 PHP_METHOD(DOMDocument, relaxNGValidateSource)
 {
-	_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
+	dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);
 }
 /* }}} end dom_document_relaxNG_validate_xml */
 
diff --git a/ext/dom/element.c b/ext/dom/element.c
@@ -476,7 +476,7 @@ PHP_METHOD(DOMElement, setAttribute)
 }
 /* }}} end dom_element_set_attribute */
 
-typedef struct _dom_deep_ns_redef_item {
+typedef struct dom_deep_ns_redef_item {
 	xmlNodePtr current_node;
 	xmlNsPtr defined_ns;
 } dom_deep_ns_redef_item;
diff --git a/ext/dom/html5_parser.c b/ext/dom/html5_parser.c
@@ -33,7 +33,7 @@
 /* libxml2 reserves 2 pointer-sized words for interned strings */
 #define LXML_INTERNED_STRINGS_SIZE (sizeof(void *) * 2)
 
-typedef struct _work_list_item {
+typedef struct work_list_item {
     lxb_dom_node_t *node;
     uintptr_t current_active_namespace;
     xmlNodePtr lxml_parent;
diff --git a/ext/dom/html5_parser.h b/ext/dom/html5_parser.h
@@ -43,14 +43,14 @@ typedef void (*lexbor_libxml2_bridge_tree_error_reporter)(
     size_t len
 );
 
-typedef struct _lexbor_libxml2_bridge_extracted_observations {
+typedef struct lexbor_libxml2_bridge_extracted_observations {
     bool has_explicit_html_tag;
     bool has_explicit_head_tag;
     bool has_explicit_body_tag;
     php_libxml_quirks_mode quirks_mode;
 } lexbor_libxml2_bridge_extracted_observations;
 
-typedef struct _lexbor_libxml2_bridge_parse_context {
+typedef struct lexbor_libxml2_bridge_parse_context {
     /* Private fields */
     lexbor_libxml2_bridge_tokenizer_error_reporter tokenizer_error_reporter;
     lexbor_libxml2_bridge_tree_error_reporter tree_error_reporter;
diff --git a/ext/dom/html_collection.c b/ext/dom/html_collection.c
@@ -25,7 +25,7 @@
 #include "html_collection.h"
 #include "namespace_compat.h"
 
-typedef struct _dom_named_item {
+typedef struct dom_named_item {
 	dom_object *context_intern;
 	xmlNodePtr node;
 } dom_named_item;
diff --git a/ext/dom/namespace_compat.c b/ext/dom/namespace_compat.c
@@ -31,7 +31,7 @@ PHP_DOM_EXPORT const php_dom_ns_magic_token *php_dom_ns_is_xlink_magic_token = (
 PHP_DOM_EXPORT const php_dom_ns_magic_token *php_dom_ns_is_xml_magic_token = (const php_dom_ns_magic_token *) DOM_XML_NS_URI;
 PHP_DOM_EXPORT const php_dom_ns_magic_token *php_dom_ns_is_xmlns_magic_token = (const php_dom_ns_magic_token *) DOM_XMLNS_NS_URI;
 
-struct _php_dom_libxml_ns_mapper {
+struct php_dom_libxml_ns_mapper {
 	php_libxml_private_data_header header;
 	/* This is used almost all the time for HTML documents, so it makes sense to cache this. */
 	xmlNsPtr html_ns;
diff --git a/ext/dom/namespace_compat.h b/ext/dom/namespace_compat.h
@@ -30,8 +30,8 @@
 struct php_dom_ns_magic_token;
 typedef struct php_dom_ns_magic_token php_dom_ns_magic_token;
 
-struct _php_dom_libxml_ns_mapper;
-typedef struct _php_dom_libxml_ns_mapper php_dom_libxml_ns_mapper;
+struct php_dom_libxml_ns_mapper;
+typedef struct php_dom_libxml_ns_mapper php_dom_libxml_ns_mapper;
 
 PHP_DOM_EXPORT extern const php_dom_ns_magic_token *php_dom_ns_is_html_magic_token;
 PHP_DOM_EXPORT extern const php_dom_ns_magic_token *php_dom_ns_is_mathml_magic_token;
@@ -40,8 +40,8 @@ PHP_DOM_EXPORT extern const php_dom_ns_magic_token *php_dom_ns_is_xlink_magic_to
 PHP_DOM_EXPORT extern const php_dom_ns_magic_token *php_dom_ns_is_xml_magic_token;
 PHP_DOM_EXPORT extern const php_dom_ns_magic_token *php_dom_ns_is_xmlns_magic_token;
 
-typedef struct _php_libxml_private_data_header php_libxml_private_data_header;
-struct _php_libxml_private_data_header;
+typedef struct php_libxml_private_data_header php_libxml_private_data_header;
+struct php_libxml_private_data_header;
 
 /* These functions make it possible to make a namespace declaration also visible as an attribute by
  * creating an equivalent attribute node. */
@@ -64,7 +64,7 @@ PHP_DOM_EXPORT bool php_dom_ns_is_fast(const xmlNode *nodep, const php_dom_ns_ma
 PHP_DOM_EXPORT bool php_dom_ns_is_fast_ex(xmlNsPtr ns, const php_dom_ns_magic_token *magic_token);
 PHP_DOM_EXPORT bool php_dom_ns_is_html_and_document_is_html(const xmlNode *nodep);
 
-typedef struct _php_dom_in_scope_ns {
+typedef struct php_dom_in_scope_ns {
    xmlNsPtr *list;
    size_t count;
    bool origin_is_ns_compat;
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
@@ -149,7 +149,7 @@ static xmlNodePtr php_dom_create_fake_namespace_decl_node_ptr(xmlNodePtr nodep,
 typedef zend_result (*dom_read_t)(dom_object *obj, zval *retval);
 typedef zend_result (*dom_write_t)(dom_object *obj, zval *newval);
 
-typedef struct _dom_prop_handler {
+typedef struct dom_prop_handler {
 	dom_read_t read_func;
 	dom_write_t write_func;
 } dom_prop_handler;
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
@@ -64,7 +64,7 @@ extern zend_module_entry dom_module_entry;
 /* Define a custom type for iterating using an unused nodetype */
 #define DOM_NODESET XML_XINCLUDE_START
 
-typedef struct _dom_xpath_object {
+typedef struct dom_xpath_object {
 	php_dom_xpath_callbacks xpath_callbacks;
 	bool register_node_ns;
 	dom_object dom;
@@ -77,7 +77,7 @@ static inline dom_xpath_object *php_xpath_obj_from_obj(zend_object *obj) {
 
 #define Z_XPATHOBJ_P(zv)  php_xpath_obj_from_obj(Z_OBJ_P((zv)))
 
-typedef struct _dom_nnodemap_object {
+typedef struct dom_nnodemap_object {
 	dom_object *baseobj;
 	zval baseobj_zv;
 	int nodetype;
@@ -107,7 +107,7 @@ typedef struct {
 	dom_object dom;
 } dom_object_namespace_node;
 
-typedef enum _dom_iterator_type {
+typedef enum dom_iterator_type {
 	DOM_NODELIST,
 	DOM_NAMEDNODEMAP,
 	DOM_DTD_NAMEDNODEMAP,
diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
@@ -80,8 +80,8 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);
 	__id = ZEND_THIS; \
 	DOM_GET_OBJ(__ptr, __id, __prtype, __intern);
 
-struct _php_dom_libxml_ns_mapper;
-typedef struct _php_dom_libxml_ns_mapper php_dom_libxml_ns_mapper;
+struct php_dom_libxml_ns_mapper;
+typedef struct php_dom_libxml_ns_mapper php_dom_libxml_ns_mapper;
 
 static zend_always_inline php_dom_libxml_ns_mapper *php_dom_get_ns_mapper(dom_object *intern)
 {
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
@@ -65,8 +65,8 @@ typedef struct {
 	size_t modification_nr;
 } php_libxml_cache_tag;
 
-typedef struct _php_libxml_private_data_header {
-	void (*dtor)(struct _php_libxml_private_data_header *);
+typedef struct php_libxml_private_data_header {
+	void (*dtor)(struct php_libxml_private_data_header *);
 	/* extra fields */
 } php_libxml_private_data_header;
 

Original file line number	Diff line number	Diff line change
`@@ -1285,7 +1285,7 @@ PHP_METHOD(DOMDocument, __construct)`
`1285`	`1285`	`}`
`1286`	`1286`	`/* }}} end DOMDocument::__construct */`
`1287`	`1287`
`1288`		`-const char _dom_get_valid_file_path(const char source, char resolved_path, int resolved_path_len ) / {{{ */`
	`1288`	`+const char dom_get_valid_file_path(const char source, char resolved_path, int resolved_path_len ) / {{{ */`
`1289`	`1289`	`{`
`1290`	`1290`	`xmlURI *uri;`
`1291`	`1291`	`xmlChar *escsource;`
`@@ -1372,7 +1372,7 @@ xmlDocPtr dom_document_parser(zval id, dom_load_mode mode, const char source,`
`1372`	`1372`	`zend_argument_value_error(1, "must not contain any null bytes");`
`1373`	`1373`	`return NULL;`
`1374`	`1374`	`}`
`1375`		`- const char *file_dest = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);`
	`1375`	`+ const char *file_dest = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);`
`1376`	`1376`	`if (file_dest) {`
`1377`	`1377`	`ctxt = xmlCreateFileParserCtxt(file_dest);`
`1378`	`1378`	`}`
`@@ -1853,7 +1853,7 @@ PHP_METHOD(DOMDocument, validate)`
`1853`	`1853`	`/* }}} */`
`1854`	`1854`
`1855`	`1855`	`#ifdef LIBXML_SCHEMAS_ENABLED`
`1856`		`-static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */`
	`1856`	`+static void dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */`
`1857`	`1857`	`{`
`1858`	`1858`	`zval *id;`
`1859`	`1859`	`xmlDoc *docp;`
`@@ -1890,7 +1890,7 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type`
`1890`	`1890`	`zend_argument_value_error(1, "must not contain any null bytes");`
`1891`	`1891`	`RETURN_THROWS();`
`1892`	`1892`	`}`
`1893`		`- valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);`
	`1893`	`+ valid_file = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);`
`1894`	`1894`	`if (!valid_file) {`
`1895`	`1895`	`PHP_LIBXML_RESTORE_GLOBALS(new_parser_ctxt);`
`1896`	`1896`	`php_error_docref(NULL, E_WARNING, "Invalid Schema file source");`
`@@ -1953,18 +1953,18 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type`
`1953`	`1953`	`/* {{{ */`
`1954`	`1954`	`PHP_METHOD(DOMDocument, schemaValidate)`
`1955`	`1955`	`{`
`1956`		`- _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);`
	`1956`	`+ dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);`
`1957`	`1957`	`}`
`1958`	`1958`	`/* }}} end dom_document_schema_validate_file */`
`1959`	`1959`
`1960`	`1960`	`/* {{{ */`
`1961`	`1961`	`PHP_METHOD(DOMDocument, schemaValidateSource)`
`1962`	`1962`	`{`
`1963`		`- _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);`
	`1963`	`+ dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);`
`1964`	`1964`	`}`
`1965`	`1965`	`/* }}} end dom_document_schema_validate */`
`1966`	`1966`
`1967`		`-static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */`
	`1967`	`+static void dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */`
`1968`	`1968`	`{`
`1969`	`1969`	`zval *id;`
`1970`	`1970`	`xmlDoc *docp;`
`@@ -1996,7 +1996,7 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ`
`1996`	`1996`	`zend_argument_value_error(1, "must not contain any null bytes");`
`1997`	`1997`	`RETURN_THROWS();`
`1998`	`1998`	`}`
`1999`		`- valid_file = _dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);`
	`1999`	`+ valid_file = dom_get_valid_file_path(source, resolved_path, MAXPATHLEN);`
`2000`	`2000`	`if (!valid_file) {`
`2001`	`2001`	`php_error_docref(NULL, E_WARNING, "Invalid RelaxNG file source");`
`2002`	`2002`	`RETURN_FALSE;`
`@@ -2050,14 +2050,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ`
`2050`	`2050`	`/* {{{ */`
`2051`	`2051`	`PHP_METHOD(DOMDocument, relaxNGValidate)`
`2052`	`2052`	`{`
`2053`		`- _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);`
	`2053`	`+ dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE);`
`2054`	`2054`	`}`
`2055`	`2055`	`/* }}} end dom_document_relaxNG_validate_file */`
`2056`	`2056`
`2057`	`2057`	`/* {{{ */`
`2058`	`2058`	`PHP_METHOD(DOMDocument, relaxNGValidateSource)`
`2059`	`2059`	`{`
`2060`		`- _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);`
	`2060`	`+ dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING);`
`2061`	`2061`	`}`
`2062`	`2062`	`/* }}} end dom_document_relaxNG_validate_xml */`
`2063`	`2063`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ PHP_METHOD(DOMElement, setAttribute)`
`476`	`476`	`}`
`477`	`477`	`/* }}} end dom_element_set_attribute */`
`478`	`478`
`479`		`-typedef struct _dom_deep_ns_redef_item {`
	`479`	`+typedef struct dom_deep_ns_redef_item {`
`480`	`480`	`xmlNodePtr current_node;`
`481`	`481`	`xmlNsPtr defined_ns;`
`482`	`482`	`} dom_deep_ns_redef_item;`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);`
`80`	`80`	`__id = ZEND_THIS; \`
`81`	`81`	`DOM_GET_OBJ(__ptr, __id, __prtype, __intern);`
`82`	`82`
`83`		`-struct _php_dom_libxml_ns_mapper;`
`84`		`-typedef struct _php_dom_libxml_ns_mapper php_dom_libxml_ns_mapper;`
	`83`	`+struct php_dom_libxml_ns_mapper;`
	`84`	`+typedef struct php_dom_libxml_ns_mapper php_dom_libxml_ns_mapper;`
`85`	`85`
`86`	`86`	`static zend_always_inline php_dom_libxml_ns_mapper php_dom_get_ns_mapper(dom_object intern)`
`87`	`87`	`{`