summaryrefslogtreecommitdiff
path: root/src/bin/efl
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2020-09-25 10:30:20 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-09-25 10:30:20 +0100
commite4866ae3ffff95c2235fc853362bac35a2a65d44 (patch)
tree449fb446dcc752a027217761fd13e7f1c5a799a9 /src/bin/efl
parent994904098cfc0178670bf051a2169def7e4cd7ad (diff)
fix order and simplify a bit order of _init|_shutdown functions
Summary: in bin/ ecore_evas.c : remove useless ecore_init eetpack.c : remove use eina_init and evas_init eet_main.c : reorder eet_init efl_debug.c : remove useless eina_init efl_debugd : reorder log domain ethumbd.c : remove eina_init ethumbd_client.c : remove ecore_init (which was anyway misplaced) Test Plan: compilation Reviewers: raster Reviewed By: raster Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12162
Diffstat (limited to 'src/bin/efl')
-rw-r--r--src/bin/efl/efl_debug.c2
-rw-r--r--src/bin/efl/efl_debugd.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/bin/efl/efl_debug.c b/src/bin/efl/efl_debug.c
index f7829c6545..7cf9768115 100644
--- a/src/bin/efl/efl_debug.c
+++ b/src/bin/efl/efl_debug.c
@@ -254,7 +254,6 @@ EINA_DEBUG_OPCODES_ARRAY_DEFINE(ops,
254int 254int
255main(int argc EINA_UNUSED, char **argv EINA_UNUSED) 255main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
256{ 256{
257 eina_init();
258 ecore_init(); 257 ecore_init();
259 258
260 my_argc = argc; 259 my_argc = argc;
@@ -271,7 +270,6 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
271 ecore_main_loop_begin(); 270 ecore_main_loop_begin();
272 271
273 ecore_shutdown(); 272 ecore_shutdown();
274 eina_shutdown();
275 273
276 return 0; 274 return 0;
277} 275}
diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c
index b23db7544c..84f789254b 100644
--- a/src/bin/efl/efl_debugd.c
+++ b/src/bin/efl/efl_debugd.c
@@ -663,11 +663,11 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
663 ecore_app_no_system_modules(); 663 ecore_app_no_system_modules();
664 664
665 eina_init(); 665 eina_init();
666 _log_dom = eina_log_domain_register("efl_debugd", EINA_COLOR_CYAN);
666 ecore_init(); 667 ecore_init();
667 ecore_con_init(); 668 ecore_con_init();
668 669
669 _retval = EXIT_SUCCESS; 670 _retval = EXIT_SUCCESS;
670 _log_dom = eina_log_domain_register("efl_debugd", EINA_COLOR_CYAN);
671 671
672 _string_to_opcode_hash = eina_hash_string_superfast_new(NULL); 672 _string_to_opcode_hash = eina_hash_string_superfast_new(NULL);
673 _opcode_register("Daemon/opcode_register", EINA_DEBUG_OPCODE_REGISTER, _opcode_register_cb); 673 _opcode_register("Daemon/opcode_register", EINA_DEBUG_OPCODE_REGISTER, _opcode_register_cb);
@@ -683,6 +683,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
683 683
684 ecore_con_shutdown(); 684 ecore_con_shutdown();
685 ecore_shutdown(); 685 ecore_shutdown();
686 eina_log_domain_unregister(_log_dom);
686 eina_shutdown(); 687 eina_shutdown();
687 688
688 return _retval; 689 return _retval;