ext/tidy: simplify tidy_instantiate

devnexen · devnexen · commit f778a3ed5752 · 2025-05-24T23:59:06.000+01:00
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
@@ -124,7 +124,7 @@ static zend_string *php_tidy_file_to_mem(const char *, bool);
 static void tidy_object_free_storage(zend_object *);
 static zend_object *tidy_object_new_node(zend_class_entry *);
 static zend_object *tidy_object_new_doc(zend_class_entry *);
-static zval *tidy_instantiate(zend_class_entry *, zval *);
+static void tidy_instantiate(zend_class_entry *, zval *);
 static zend_result tidy_doc_cast_handler(zend_object *, zval *, int);
 static zend_result tidy_node_cast_handler(zend_object *, zval *, int);
 static void tidy_doc_update_properties(PHPTidyObj *);
@@ -469,10 +469,9 @@ static zend_object *tidy_object_new_doc(zend_class_entry *class_type)
 	return tidy_object_new(class_type, &tidy_object_handlers_doc, is_doc);
 }
 
-static zval *tidy_instantiate(zend_class_entry *pce, zval *object)
+static void tidy_instantiate(zend_class_entry *pce, zval *object)
 {
 	object_init_ex(object, pce);
-	return object;
 }
 
 static zend_result tidy_doc_cast_handler(zend_object *in, zval *out, int type)

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ static zend_string php_tidy_file_to_mem(const char , bool);`
`124`	`124`	`static void tidy_object_free_storage(zend_object *);`
`125`	`125`	`static zend_object tidy_object_new_node(zend_class_entry );`
`126`	`126`	`static zend_object tidy_object_new_doc(zend_class_entry );`
`127`		`-static zval tidy_instantiate(zend_class_entry , zval *);`
	`127`	`+static void tidy_instantiate(zend_class_entry , zval );`
`128`	`128`	`static zend_result tidy_doc_cast_handler(zend_object , zval , int);`
`129`	`129`	`static zend_result tidy_node_cast_handler(zend_object , zval , int);`
`130`	`130`	`static void tidy_doc_update_properties(PHPTidyObj *);`
`@@ -469,10 +469,9 @@ static zend_object tidy_object_new_doc(zend_class_entry class_type)`
`469`	`469`	`return tidy_object_new(class_type, &tidy_object_handlers_doc, is_doc);`
`470`	`470`	`}`
`471`	`471`
`472`		`-static zval tidy_instantiate(zend_class_entry pce, zval *object)`
	`472`	`+static void tidy_instantiate(zend_class_entry pce, zval object)`
`473`	`473`	`{`
`474`	`474`	`object_init_ex(object, pce);`
`475`		`- return object;`
`476`	`475`	`}`
`477`	`476`
`478`	`477`	`static zend_result tidy_doc_cast_handler(zend_object in, zval out, int type)`