Rename php_uri_parser free to destroy (#19888)

bukka · web-flow · commit 2b637dfc4e5e · 2025-09-19T20:12:35.000+02:00
This is to fix Windows debug build when it is macro for _free_dbg
diff --git a/ext/uri/php_uri.c b/ext/uri/php_uri.c
@@ -167,7 +167,7 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_fragment(const uri_interna
 
 ZEND_ATTRIBUTE_NONNULL PHPAPI void php_uri_free(uri_internal_t *internal_uri)
 {
-	internal_uri->parser->free(internal_uri->uri);
+	internal_uri->parser->destroy(internal_uri->uri);
 	internal_uri->uri = NULL;
 	internal_uri->parser = NULL;
 	efree(internal_uri);
@@ -366,7 +366,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2) PHPAPI void php_uri_instantiate_uri(
 	}
 
 	if (pass_errors_by_ref_and_free(errors_zv, &errors) == FAILURE) {
-		uri_parser->free(uri);
+		uri_parser->destroy(uri);
 		RETURN_THROWS();
 	}
 
@@ -1045,7 +1045,7 @@ PHPAPI void php_uri_object_handler_free(zend_object *object)
 {
 	uri_object_t *uri_object = uri_object_from_obj(object);
 
-	uri_object->internal.parser->free(uri_object->internal.uri);
+	uri_object->internal.parser->destroy(uri_object->internal.uri);
 	zend_object_std_dtor(&uri_object->std);
 }
 
@@ -1077,7 +1077,7 @@ PHPAPI zend_result php_uri_parser_register(const php_uri_parser *uri_parser)
 	ZEND_ASSERT(uri_parser->parse != NULL);
 	ZEND_ASSERT(uri_parser->clone != NULL || strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 0);
 	ZEND_ASSERT(uri_parser->to_string != NULL || strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 0);
-	ZEND_ASSERT(uri_parser->free != NULL);
+	ZEND_ASSERT(uri_parser->destroy != NULL);
 
 	zend_result result = zend_hash_add_ptr(&uri_parsers, key, (void *) uri_parser) != NULL ? SUCCESS : FAILURE;
 
diff --git a/ext/uri/php_uri_common.h b/ext/uri/php_uri_common.h
@@ -119,11 +119,11 @@ typedef struct php_uri_parser {
 	zend_string *(*to_string)(void *uri, php_uri_recomposition_mode recomposition_mode, bool exclude_fragment);
 
 	/**
-	 * Frees the provided URI.
+	 * Destroy (free) the provided URI.
 	 *
 	 * @param uri The URI to free. Must do nothing if NULL.
 	 */
-	void (*free)(void *uri);
+	void (*destroy)(void *uri);
 
 	struct {
 		php_uri_property_handler scheme;
diff --git a/ext/uri/uri_parser_php_parse_url.c b/ext/uri/uri_parser_php_parse_url.c
@@ -154,7 +154,7 @@ static void *uri_parser_php_parse_url_parse(const char *uri_str, size_t uri_str_
 	return url;
 }
 
-static void uri_parser_php_parse_url_free(void *uri)
+static void uri_parser_php_parse_url_destroy(void *uri)
 {
 	php_url *parse_url_uri = uri;
 
@@ -170,7 +170,7 @@ const php_uri_parser php_uri_parser_php_parse_url = {
 	.parse = uri_parser_php_parse_url_parse,
 	.clone = NULL,
 	.to_string = NULL,
-	.free = uri_parser_php_parse_url_free,
+	.destroy = uri_parser_php_parse_url_destroy,
 	{
 		.scheme = {.read = uri_parser_php_parse_url_scheme_read, .write = NULL},
 		.username = {.read = uri_parser_php_parse_url_username_read, .write = NULL},
diff --git a/ext/uri/uri_parser_rfc3986.c b/ext/uri/uri_parser_rfc3986.c
@@ -40,7 +40,7 @@ static void *php_uri_parser_rfc3986_memory_manager_reallocarray(UriMemoryManager
 	return safe_erealloc(ptr, nmemb, size, 0);
 }
 
-static void php_uri_parser_rfc3986_memory_manager_free(UriMemoryManager *memory_manager, void *ptr)
+static void php_uri_parser_rfc3986_memory_manager_destroy(UriMemoryManager *memory_manager, void *ptr)
 {
 	efree(ptr);
 }
@@ -50,7 +50,7 @@ static const UriMemoryManager php_uri_parser_rfc3986_memory_manager = {
 	.calloc = php_uri_parser_rfc3986_memory_manager_calloc,
 	.realloc = php_uri_parser_rfc3986_memory_manager_realloc,
 	.reallocarray = php_uri_parser_rfc3986_memory_manager_reallocarray,
-	.free = php_uri_parser_rfc3986_memory_manager_free,
+	.free = php_uri_parser_rfc3986_memory_manager_destroy,
 	.userData = NULL,
 };
 
@@ -593,7 +593,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_string *php_uri_parser_rfc3986_to_string(void
 	return uri_string;
 }
 
-static void php_uri_parser_rfc3986_free(void *uri)
+static void php_uri_parser_rfc3986_destroy(void *uri)
 {
 	php_uri_parser_rfc3986_uris *uriparser_uris = uri;
 
@@ -612,7 +612,7 @@ const php_uri_parser php_uri_parser_rfc3986 = {
 	.parse = php_uri_parser_rfc3986_parse,
 	.clone = php_uri_parser_rfc3986_clone,
 	.to_string = php_uri_parser_rfc3986_to_string,
-	.free = php_uri_parser_rfc3986_free,
+	.destroy = php_uri_parser_rfc3986_destroy,
 	{
 		.scheme = {.read = php_uri_parser_rfc3986_scheme_read, .write = php_uri_parser_rfc3986_scheme_write},
 		.username = {.read = php_uri_parser_rfc3986_username_read, .write = NULL},
diff --git a/ext/uri/uri_parser_whatwg.c b/ext/uri/uri_parser_whatwg.c
@@ -614,7 +614,7 @@ static zend_string *php_uri_parser_whatwg_to_string(void *uri, php_uri_recomposi
 	return smart_str_extract(&uri_str);
 }
 
-static void php_uri_parser_whatwg_free(void *uri)
+static void php_uri_parser_whatwg_destroy(void *uri)
 {
 	lxb_url_t *lexbor_uri = uri;
 
@@ -626,7 +626,7 @@ const php_uri_parser php_uri_parser_whatwg = {
 	.parse = php_uri_parser_whatwg_parse,
 	.clone = php_uri_parser_whatwg_clone,
 	.to_string = php_uri_parser_whatwg_to_string,
-	.free = php_uri_parser_whatwg_free,
+	.destroy = php_uri_parser_whatwg_destroy,
 	{
 		.scheme = {.read = php_uri_parser_whatwg_scheme_read, .write = php_uri_parser_whatwg_scheme_write},
 		.username = {.read = php_uri_parser_whatwg_username_read, .write = php_uri_parser_whatwg_username_write},

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ ZEND_ATTRIBUTE_NONNULL PHPAPI zend_result php_uri_get_fragment(const uri_interna`
`167`	`167`
`168`	`168`	`ZEND_ATTRIBUTE_NONNULL PHPAPI void php_uri_free(uri_internal_t *internal_uri)`
`169`	`169`	`{`
`170`		`- internal_uri->parser->free(internal_uri->uri);`
	`170`	`+ internal_uri->parser->destroy(internal_uri->uri);`
`171`	`171`	`internal_uri->uri = NULL;`
`172`	`172`	`internal_uri->parser = NULL;`
`173`	`173`	`efree(internal_uri);`
`@@ -366,7 +366,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 2) PHPAPI void php_uri_instantiate_uri(`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`if (pass_errors_by_ref_and_free(errors_zv, &errors) == FAILURE) {`
`369`		`- uri_parser->free(uri);`
	`369`	`+ uri_parser->destroy(uri);`
`370`	`370`	`RETURN_THROWS();`
`371`	`371`	`}`
`372`	`372`
`@@ -1045,7 +1045,7 @@ PHPAPI void php_uri_object_handler_free(zend_object *object)`
`1045`	`1045`	`{`
`1046`	`1046`	`uri_object_t *uri_object = uri_object_from_obj(object);`
`1047`	`1047`
`1048`		`- uri_object->internal.parser->free(uri_object->internal.uri);`
	`1048`	`+ uri_object->internal.parser->destroy(uri_object->internal.uri);`
`1049`	`1049`	`zend_object_std_dtor(&uri_object->std);`
`1050`	`1050`	`}`
`1051`	`1051`
`@@ -1077,7 +1077,7 @@ PHPAPI zend_result php_uri_parser_register(const php_uri_parser *uri_parser)`
`1077`	`1077`	`ZEND_ASSERT(uri_parser->parse != NULL);`
`1078`	`1078`	`ZEND_ASSERT(uri_parser->clone != NULL \|\| strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 0);`
`1079`	`1079`	`ZEND_ASSERT(uri_parser->to_string != NULL \|\| strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 0);`
`1080`		`- ZEND_ASSERT(uri_parser->free != NULL);`
	`1080`	`+ ZEND_ASSERT(uri_parser->destroy != NULL);`
`1081`	`1081`
`1082`	`1082`	`zend_result result = zend_hash_add_ptr(&uri_parsers, key, (void *) uri_parser) != NULL ? SUCCESS : FAILURE;`
`1083`	`1083`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ static void uri_parser_php_parse_url_parse(const char uri_str, size_t uri_str_`
`154`	`154`	`return url;`
`155`	`155`	`}`
`156`	`156`
`157`		`-static void uri_parser_php_parse_url_free(void *uri)`
	`157`	`+static void uri_parser_php_parse_url_destroy(void *uri)`
`158`	`158`	`{`
`159`	`159`	`php_url *parse_url_uri = uri;`
`160`	`160`
`@@ -170,7 +170,7 @@ const php_uri_parser php_uri_parser_php_parse_url = {`
`170`	`170`	`.parse = uri_parser_php_parse_url_parse,`
`171`	`171`	`.clone = NULL,`
`172`	`172`	`.to_string = NULL,`
`173`		`- .free = uri_parser_php_parse_url_free,`
	`173`	`+ .destroy = uri_parser_php_parse_url_destroy,`
`174`	`174`	`{`
`175`	`175`	`.scheme = {.read = uri_parser_php_parse_url_scheme_read, .write = NULL},`
`176`	`176`	`.username = {.read = uri_parser_php_parse_url_username_read, .write = NULL},`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ static void *php_uri_parser_rfc3986_memory_manager_reallocarray(UriMemoryManager`
`40`	`40`	`return safe_erealloc(ptr, nmemb, size, 0);`
`41`	`41`	`}`
`42`	`42`
`43`		`-static void php_uri_parser_rfc3986_memory_manager_free(UriMemoryManager memory_manager, void ptr)`
	`43`	`+static void php_uri_parser_rfc3986_memory_manager_destroy(UriMemoryManager memory_manager, void ptr)`
`44`	`44`	`{`
`45`	`45`	`efree(ptr);`
`46`	`46`	`}`
`@@ -50,7 +50,7 @@ static const UriMemoryManager php_uri_parser_rfc3986_memory_manager = {`
`50`	`50`	`.calloc = php_uri_parser_rfc3986_memory_manager_calloc,`
`51`	`51`	`.realloc = php_uri_parser_rfc3986_memory_manager_realloc,`
`52`	`52`	`.reallocarray = php_uri_parser_rfc3986_memory_manager_reallocarray,`
`53`		`- .free = php_uri_parser_rfc3986_memory_manager_free,`
	`53`	`+ .free = php_uri_parser_rfc3986_memory_manager_destroy,`
`54`	`54`	`.userData = NULL,`
`55`	`55`	`};`
`56`	`56`
`@@ -593,7 +593,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_string *php_uri_parser_rfc3986_to_string(void`
`593`	`593`	`return uri_string;`
`594`	`594`	`}`
`595`	`595`
`596`		`-static void php_uri_parser_rfc3986_free(void *uri)`
	`596`	`+static void php_uri_parser_rfc3986_destroy(void *uri)`
`597`	`597`	`{`
`598`	`598`	`php_uri_parser_rfc3986_uris *uriparser_uris = uri;`
`599`	`599`
`@@ -612,7 +612,7 @@ const php_uri_parser php_uri_parser_rfc3986 = {`
`612`	`612`	`.parse = php_uri_parser_rfc3986_parse,`
`613`	`613`	`.clone = php_uri_parser_rfc3986_clone,`
`614`	`614`	`.to_string = php_uri_parser_rfc3986_to_string,`
`615`		`- .free = php_uri_parser_rfc3986_free,`
	`615`	`+ .destroy = php_uri_parser_rfc3986_destroy,`
`616`	`616`	`{`
`617`	`617`	`.scheme = {.read = php_uri_parser_rfc3986_scheme_read, .write = php_uri_parser_rfc3986_scheme_write},`
`618`	`618`	`.username = {.read = php_uri_parser_rfc3986_username_read, .write = NULL},`
Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ static zend_string php_uri_parser_whatwg_to_string(void uri, php_uri_recomposi`
`614`	`614`	`return smart_str_extract(&uri_str);`
`615`	`615`	`}`
`616`	`616`
`617`		`-static void php_uri_parser_whatwg_free(void *uri)`
	`617`	`+static void php_uri_parser_whatwg_destroy(void *uri)`
`618`	`618`	`{`
`619`	`619`	`lxb_url_t *lexbor_uri = uri;`
`620`	`620`
`@@ -626,7 +626,7 @@ const php_uri_parser php_uri_parser_whatwg = {`
`626`	`626`	`.parse = php_uri_parser_whatwg_parse,`
`627`	`627`	`.clone = php_uri_parser_whatwg_clone,`
`628`	`628`	`.to_string = php_uri_parser_whatwg_to_string,`
`629`		`- .free = php_uri_parser_whatwg_free,`
	`629`	`+ .destroy = php_uri_parser_whatwg_destroy,`
`630`	`630`	`{`
`631`	`631`	`.scheme = {.read = php_uri_parser_whatwg_scheme_read, .write = php_uri_parser_whatwg_scheme_write},`
`632`	`632`	`.username = {.read = php_uri_parser_whatwg_username_read, .write = php_uri_parser_whatwg_username_write},`