summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-06-15 16:40:23 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-19 13:55:36 -0400
commit0e49bfda65563b2ef247d126234d96c848645a12 (patch)
tree9e6e8e9283ce5c370af6c5482cc2d780224aacd5
parentee3df4efc384d71b7b83b7538423bf9d9019f6eb (diff)
eina: don't init subcomponents inside eina_debug
this should be done in a single location to avoid dependency conflicts and make the code easier to read Differential Revision: https://phab.enlightenment.org/D6301
-rw-r--r--src/lib/eina/eina_debug.c3
-rw-r--r--src/lib/eina/eina_main.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index 9dd1a092d5..4ffb8d1985 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -711,9 +711,6 @@ eina_debug_init(void)
711 } 711 }
712 // mark as initted 712 // mark as initted
713 _inited = EINA_TRUE; 713 _inited = EINA_TRUE;
714 eina_module_init();
715 eina_mempool_init();
716 eina_list_init();
717 // For Windows support GetModuleFileName can be used 714 // For Windows support GetModuleFileName can be used
718 // set up thread things 715 // set up thread things
719 eina_spinlock_new(&_eina_debug_lock); 716 eina_spinlock_new(&_eina_debug_lock);
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index 8591878b31..3aa7e24e7a 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -170,6 +170,9 @@ struct eina_desc_setup
170static const struct eina_desc_setup _eina_desc_setup[] = { 170static const struct eina_desc_setup _eina_desc_setup[] = {
171#define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown} 171#define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown}
172 /* log is a special case as it needs printf */ 172 /* log is a special case as it needs printf */
173 S(module),
174 S(mempool),
175 S(list),
173 S(debug), 176 S(debug),
174 S(evlog), 177 S(evlog),
175 S(stringshare), 178 S(stringshare),
@@ -180,9 +183,6 @@ static const struct eina_desc_setup _eina_desc_setup[] = {
180 S(accessor), 183 S(accessor),
181 S(inarray), 184 S(inarray),
182 S(array), 185 S(array),
183 S(module),
184 S(mempool),
185 S(list),
186 S(binshare), 186 S(binshare),
187 S(ustringshare), 187 S(ustringshare),
188 S(matrixsparse), 188 S(matrixsparse),