Fix function libxml free error signature

nikic · nikic · commit 53e07bac79c6 · 2020-04-15T09:58:19.000+02:00
Fixes a -Wcast-function-type warning.
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
@@ -418,11 +418,10 @@ php_libxml_output_buffer_create_filename(const char *URI,
 	return(ret);
 }
 
-static int _php_libxml_free_error(xmlErrorPtr error)
+static void _php_libxml_free_error(void *ptr)
 {
 	/* This will free the libxml alloc'd memory */
-	xmlResetError(error);
-	return 1;
+	xmlResetError((xmlErrorPtr) ptr);
 }
 
 static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
@@ -943,7 +942,7 @@ PHP_FUNCTION(libxml_use_internal_errors)
 		xmlSetStructuredErrorFunc(NULL, php_libxml_structured_error_handler);
 		if (LIBXML(error_list) == NULL) {
 			LIBXML(error_list) = (zend_llist *) emalloc(sizeof(zend_llist));
-			zend_llist_init(LIBXML(error_list), sizeof(xmlError), (llist_dtor_func_t) _php_libxml_free_error, 0);
+			zend_llist_init(LIBXML(error_list), sizeof(xmlError), _php_libxml_free_error, 0);
 		}
 	}
 	RETURN_BOOL(retval);

Original file line number	Diff line number	Diff line change
`@@ -418,11 +418,10 @@ php_libxml_output_buffer_create_filename(const char *URI,`
`418`	`418`	`return(ret);`
`419`	`419`	`}`
`420`	`420`
`421`		`-static int _php_libxml_free_error(xmlErrorPtr error)`
	`421`	`+static void _php_libxml_free_error(void *ptr)`
`422`	`422`	`{`
`423`	`423`	`/* This will free the libxml alloc'd memory */`
`424`		`- xmlResetError(error);`
`425`		`- return 1;`
	`424`	`+ xmlResetError((xmlErrorPtr) ptr);`
`426`	`425`	`}`
`427`	`426`
`428`	`427`	`static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)`
`@@ -943,7 +942,7 @@ PHP_FUNCTION(libxml_use_internal_errors)`
`943`	`942`	`xmlSetStructuredErrorFunc(NULL, php_libxml_structured_error_handler);`
`944`	`943`	`if (LIBXML(error_list) == NULL) {`
`945`	`944`	`LIBXML(error_list) = (zend_llist *) emalloc(sizeof(zend_llist));`
`946`		`- zend_llist_init(LIBXML(error_list), sizeof(xmlError), (llist_dtor_func_t) _php_libxml_free_error, 0);`
	`945`	`+ zend_llist_init(LIBXML(error_list), sizeof(xmlError), _php_libxml_free_error, 0);`
`947`	`946`	`}`
`948`	`947`	`}`
`949`	`948`	`RETURN_BOOL(retval);`