diff --git a/legacy/eina/src/include/eina_module.h b/legacy/eina/src/include/eina_module.h index 8156caa1df..dfa9cbc2e9 100644 --- a/legacy/eina/src/include/eina_module.h +++ b/legacy/eina/src/include/eina_module.h @@ -63,7 +63,7 @@ EAPI char *eina_module_environment_path_get(const char *env, const char *sub_dir EAPI Eina_Array * eina_module_list_get(Eina_Array *array, const char *path, unsigned int recursive, Eina_Module_Cb cb, void *data) EINA_MALLOC EINA_ARG_NONNULL(2) EINA_WARN_UNUSED_RESULT; EAPI void eina_module_list_load(Eina_Array *list) EINA_ARG_NONNULL(1); EAPI void eina_module_list_unload(Eina_Array *list) EINA_ARG_NONNULL(1); -EAPI void eina_module_list_delete(Eina_Array *list) EINA_ARG_NONNULL(1); +EAPI void eina_module_list_flush(Eina_Array *list) EINA_ARG_NONNULL(1); /** * @} diff --git a/legacy/eina/src/lib/eina_mempool.c b/legacy/eina/src/lib/eina_mempool.c index 06fe277bc1..bfd55ddd80 100644 --- a/legacy/eina/src/lib/eina_mempool.c +++ b/legacy/eina/src/lib/eina_mempool.c @@ -217,7 +217,7 @@ eina_mempool_shutdown(void) ememoa_fixed_shutdown(); #endif /* dynamic backends */ - eina_module_list_delete(_modules); + eina_module_list_flush(_modules); if (_modules) eina_array_free(_modules); diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c index bbab43405e..aa6cdbcbe2 100644 --- a/legacy/eina/src/lib/eina_module.c +++ b/legacy/eina/src/lib/eina_module.c @@ -545,7 +545,7 @@ EAPI void eina_module_list_unload(Eina_Array *array) * Helper function that iterates over the list of modules and calls * eina_module_free on each */ -EAPI void eina_module_list_delete(Eina_Array *array) +EAPI void eina_module_list_flush(Eina_Array *array) { Eina_Array_Iterator iterator; Eina_Module *m; diff --git a/legacy/eina/src/lib/eina_rectangle.c b/legacy/eina/src/lib/eina_rectangle.c index 4d79c90554..c72fc0455e 100644 --- a/legacy/eina/src/lib/eina_rectangle.c +++ b/legacy/eina/src/lib/eina_rectangle.c @@ -250,7 +250,7 @@ eina_rectangle_init(void) #endif _eina_rectangle_alloc_mp = eina_mempool_add(choice, "rectangle-alloc", NULL, - sizeof (Eina_Rectangle_Alloc) + sizeof (Eina_Rectangle), 256); + sizeof (Eina_Rectangle_Alloc) + sizeof (Eina_Rectangle), 1024); if (!_eina_rectangle_alloc_mp) { EINA_ERROR_PERR("ERROR: Mempool for rectangle cannot be allocated in list init.\n"); diff --git a/legacy/eina/src/tests/eina_bench.c b/legacy/eina/src/tests/eina_bench.c index dae1515499..1f5abfc2ab 100644 --- a/legacy/eina/src/tests/eina_bench.c +++ b/legacy/eina/src/tests/eina_bench.c @@ -59,7 +59,7 @@ static void _mempool_init(void) static void _mempool_shutdown(void) { - eina_module_list_delete(_modules); + eina_module_list_flush(_modules); /* TODO delete the list */ eina_mempool_shutdown(); } diff --git a/legacy/eina/src/tests/eina_suite.c b/legacy/eina/src/tests/eina_suite.c index 62905ce21e..782c7fbf1d 100644 --- a/legacy/eina/src/tests/eina_suite.c +++ b/legacy/eina/src/tests/eina_suite.c @@ -88,7 +88,7 @@ static void _mempool_init(void) static void _mempool_shutdown(void) { - eina_module_list_delete(_modules); + eina_module_list_flush(_modules); /* TODO delete the list */ eina_mempool_shutdown(); } diff --git a/legacy/eina/src/tests/eina_test_mempool.c b/legacy/eina/src/tests/eina_test_mempool.c index 8556a4f360..09ab5d1019 100644 --- a/legacy/eina/src/tests/eina_test_mempool.c +++ b/legacy/eina/src/tests/eina_test_mempool.c @@ -37,7 +37,7 @@ _mempool_init(void) static void _mempool_shutdown(void) { - eina_module_list_delete(_modules); + eina_module_list_flush(_modules); /* TODO delete the list */ eina_mempool_shutdown(); } diff --git a/legacy/eina/src/tests/eina_test_module.c b/legacy/eina/src/tests/eina_test_module.c index ba972bbee4..86a7b469d2 100644 --- a/legacy/eina/src/tests/eina_test_module.c +++ b/legacy/eina/src/tests/eina_test_module.c @@ -70,7 +70,7 @@ START_TEST(eina_module_load_unload) fail_if(!_modules); eina_module_list_load(_modules); eina_module_list_unload(_modules); - eina_module_list_delete(_modules); + eina_module_list_flush(_modules); /* TODO delete the list */ eina_module_shutdown(); }