Move lexbor memory setup to ext/lexbor

Author: ndossche

ext/dom/php_dom.c

@@ -33,8 +33,6 @@
 #include "dom_properties.h"
 #include "token_list.h"
 #include "zend_interfaces.h"
-#include <lexbor/core/types.h>
-#include <lexbor/core/lexbor.h>
 
 #include "ext/standard/info.h"
 
@@ -739,22 +737,6 @@ void dom_xpath_objects_free_storage(zend_object *object);
 HashTable *dom_xpath_get_gc(zend_object *object, zval **table, int *n);
 #endif
 
-static void *dom_malloc(size_t size) {
-	return emalloc(size);
-}
-
-static void *dom_realloc(void *dst, size_t size) {
-	return erealloc(dst, size);
-}
-
-static void *dom_calloc(size_t num, size_t size) {
-	return ecalloc(num, size);
-}
-
-static void dom_free(void *ptr) {
-	efree(ptr);
-}
-
 /* {{{ PHP_MINIT_FUNCTION(dom) */
 PHP_MINIT_FUNCTION(dom)
 {
@@ -1325,8 +1307,6 @@ PHP_MINIT_FUNCTION(dom)
 	php_libxml_register_export(dom_node_class_entry, php_dom_export_node);
 	php_libxml_register_export(dom_modern_node_class_entry, php_dom_export_node);
 
-	lexbor_memory_setup(dom_malloc, dom_realloc, dom_calloc, dom_free);
-
 	return SUCCESS;
 }
 /* }}} */

ext/lexbor/php_lexbor.c

@@ -22,6 +22,8 @@
 #include "php.h"
 #include "zend_globals.h"
 #include "ext/standard/info.h"
+#include "lexbor/core/types.h"
+#include "lexbor/core/lexbor.h"
 
 #ifdef HAVE_LEXBOR
 
@@ -35,6 +37,26 @@ ZEND_TSRMLS_CACHE_DEFINE()
 ZEND_GET_MODULE(lexbor)
 #endif /* COMPILE_DL_LEXBOR */
 
+static void *php_lexbor_malloc(size_t size)
+{
+	return emalloc(size);
+}
+
+static void *php_lexbor_realloc(void *dst, size_t size)
+{
+	return erealloc(dst, size);
+}
+
+static void *php_lexbor_calloc(size_t num, size_t size)
+{
+	return ecalloc(num, size);
+}
+
+static void php_lexbor_free(void *ptr)
+{
+	efree(ptr);
+}
+
 static PHP_MINFO_FUNCTION(lexbor)
 {
 	php_info_print_table_start();
@@ -43,11 +65,17 @@ static PHP_MINFO_FUNCTION(lexbor)
 	php_info_print_table_end();
 }
 
+static PHP_MINIT_FUNCTION(lexbor)
+{
+	lexbor_memory_setup(php_lexbor_malloc, php_lexbor_realloc, php_lexbor_calloc, php_lexbor_free);
+	return SUCCESS;
+}
+
 zend_module_entry lexbor_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"lexbor",                   /* extension name */
 	NULL,                       /* extension function list */
-	NULL,                       /* extension-wide startup function */
+	PHP_MINIT(lexbor),          /* extension-wide startup function */
 	NULL,                       /* extension-wide shutdown function */
 	NULL,                       /* per-request startup function */
 	NULL,                       /* per-request shutdown function */