diff --git a/legacy/edje/src/lib/edje_module.c b/legacy/edje/src/lib/edje_module.c index dd4cea7816..1828e7c29d 100644 --- a/legacy/edje/src/lib/edje_module.c +++ b/legacy/edje/src/lib/edje_module.c @@ -121,7 +121,7 @@ _edje_module_shutdown(void) Eina_List *l; const char *data; - eina_module_list_flush(_available_modules); + eina_module_list_free(_available_modules); if (_available_modules) { eina_array_free(_available_modules); diff --git a/legacy/eina/src/include/eina_module.h b/legacy/eina/src/include/eina_module.h index dd9c20bf7b..2e31309dc0 100644 --- a/legacy/eina/src/include/eina_module.h +++ b/legacy/eina/src/include/eina_module.h @@ -69,7 +69,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_flush(Eina_Array *list) EINA_ARG_NONNULL(1); +EAPI void eina_module_list_free(Eina_Array *list) EINA_ARG_NONNULL(1); EAPI Eina_Module * eina_module_find(const Eina_Array *array, const char *module) EINA_ARG_NONNULL(1, 2) EINA_PURE; /** diff --git a/legacy/eina/src/lib/eina_mempool.c b/legacy/eina/src/lib/eina_mempool.c index 4934b9613b..83d2795ae8 100644 --- a/legacy/eina/src/lib/eina_mempool.c +++ b/legacy/eina/src/lib/eina_mempool.c @@ -238,7 +238,7 @@ eina_mempool_shutdown(void) buddy_shutdown(); #endif /* dynamic backends */ - eina_module_list_flush(_modules); + eina_module_list_free(_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 03bbb861da..e6029c6919 100644 --- a/legacy/eina/src/lib/eina_module.c +++ b/legacy/eina/src/lib/eina_module.c @@ -613,7 +613,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_flush(Eina_Array *array) +EAPI void eina_module_list_free(Eina_Array *array) { Eina_Array_Iterator iterator; Eina_Module *m; diff --git a/legacy/eina/src/tests/eina_bench.c b/legacy/eina/src/tests/eina_bench.c index 9f327b4f7d..fdb76be89b 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_flush(_modules); + eina_module_list_free(_modules); /* TODO delete the list */ eina_shutdown(); } diff --git a/legacy/eina/src/tests/eina_suite.c b/legacy/eina/src/tests/eina_suite.c index e753daeafe..4fdc7b4c2e 100644 --- a/legacy/eina/src/tests/eina_suite.c +++ b/legacy/eina/src/tests/eina_suite.c @@ -115,7 +115,7 @@ static void _mempool_init(void) static void _mempool_shutdown(void) { - eina_module_list_flush(_modules); + eina_module_list_free(_modules); /* TODO delete the list */ eina_shutdown(); } diff --git a/legacy/eina/src/tests/eina_test_mempool.c b/legacy/eina/src/tests/eina_test_mempool.c index 06bdcc0cf8..af93c981e7 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_flush(_modules); + eina_module_list_free(_modules); /* TODO delete the list */ eina_shutdown(); } diff --git a/legacy/eina/src/tests/eina_test_module.c b/legacy/eina/src/tests/eina_test_module.c index eeeb9cd593..fdfa171eb1 100644 --- a/legacy/eina/src/tests/eina_test_module.c +++ b/legacy/eina/src/tests/eina_test_module.c @@ -53,7 +53,7 @@ START_TEST(eina_module_load_unload) fail_if(!_modules); eina_module_list_load(_modules); eina_module_list_unload(_modules); - eina_module_list_flush(_modules); + eina_module_list_free(_modules); /* TODO delete the list */ eina_shutdown(); } diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c index a8029820f3..995f7d122d 100644 --- a/legacy/ethumb/src/lib/Ethumb.c +++ b/legacy/ethumb/src/lib/Ethumb.c @@ -146,7 +146,7 @@ _ethumb_plugins_unload(void) eina_hash_free(_plugins_ext); _plugins_ext = NULL; eina_module_list_unload(_plugins); - eina_module_list_flush(_plugins); + eina_module_list_free(_plugins); eina_array_free(_plugins); _plugins = NULL; }