raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e4866ae3ffff95c2235fc853362bac35a2a65d44
commit e4866ae3ffff95c2235fc853362bac35a2a65d44
Author: Vincent Torri <vincent.to...@gmail.com>
Date: Fri Sep 25 10:30:20 2020 +0100
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
---
src/bin/ecore_evas/ecore_evas_convert.c | 4 ++--
src/bin/ecore_evas/eetpack.c | 4 ----
src/bin/eet/eet_main.c | 22 +++++++++++-----------
src/bin/efl/efl_debug.c | 2 --
src/bin/efl/efl_debugd.c | 3 ++-
src/bin/ethumb_client/ethumbd.c | 3 ---
src/bin/ethumb_client/ethumbd_client.c | 2 --
7 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/src/bin/ecore_evas/ecore_evas_convert.c
b/src/bin/ecore_evas/ecore_evas_convert.c
index 8b4f19ab2f..cefc16cc84 100644
--- a/src/bin/ecore_evas/ecore_evas_convert.c
+++ b/src/bin/ecore_evas/ecore_evas_convert.c
@@ -128,7 +128,6 @@ main(int argc, char *argv[])
eina_init();
_log_dom = eina_log_domain_register(argv[0], EINA_COLOR_CYAN);
- ecore_init();
ecore_evas_init();
arg_index = ecore_getopt_parse(&optdesc, values, argc, argv);
@@ -211,7 +210,8 @@ main(int argc, char *argv[])
end:
if (flags) eina_strbuf_free(flags);
ecore_evas_shutdown();
- ecore_shutdown();
+ eina_log_domain_unregister(_log_dom);
+ eina_shutdown();
return r;
}
diff --git a/src/bin/ecore_evas/eetpack.c b/src/bin/ecore_evas/eetpack.c
index 6e7616d189..9be4c2f77a 100644
--- a/src/bin/ecore_evas/eetpack.c
+++ b/src/bin/ecore_evas/eetpack.c
@@ -274,9 +274,7 @@ main(int argc, char **argv)
return -1;
}
- eina_init();
eet_init();
- evas_init();
ecore_evas_init();
scratch_canvas_init();
@@ -285,8 +283,6 @@ main(int argc, char **argv)
if (ef) eet_close(ef);
ecore_evas_shutdown();
- evas_shutdown();
eet_shutdown();
- eina_shutdown();
return 0;
}
diff --git a/src/bin/eet/eet_main.c b/src/bin/eet/eet_main.c
index 7da5cfd4d3..8061dd956e 100644
--- a/src/bin/eet/eet_main.c
+++ b/src/bin/eet/eet_main.c
@@ -440,17 +440,6 @@ int
main(int argc,
char **argv)
{
- if (!eet_init())
- return -1;
-
- _eet_main_log_dom = eina_log_domain_register("eet_main", EINA_COLOR_CYAN);
- if(_eet_main_log_dom < -1)
- {
- EINA_LOG_ERR("Impossible to create a log domain for eet_main.");
- eet_shutdown();
- return -1;
- }
-
if (argc < 2)
{
help:
@@ -468,6 +457,17 @@ help:
" eet -h print out this
help message\n"
" eet -V [--version] show program
version\n"
);
+
+ return -1;
+ }
+
+ if (!eet_init())
+ return -1;
+
+ _eet_main_log_dom = eina_log_domain_register("eet_main", EINA_COLOR_CYAN);
+ if(_eet_main_log_dom < -1)
+ {
+ EINA_LOG_ERR("Impossible to create a log domain for eet_main.");
eet_shutdown();
return -1;
}
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,
int
main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
{
- eina_init();
ecore_init();
my_argc = argc;
@@ -271,7 +270,6 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
ecore_main_loop_begin();
ecore_shutdown();
- eina_shutdown();
return 0;
}
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)
ecore_app_no_system_modules();
eina_init();
+ _log_dom = eina_log_domain_register("efl_debugd", EINA_COLOR_CYAN);
ecore_init();
ecore_con_init();
_retval = EXIT_SUCCESS;
- _log_dom = eina_log_domain_register("efl_debugd", EINA_COLOR_CYAN);
_string_to_opcode_hash = eina_hash_string_superfast_new(NULL);
_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)
ecore_con_shutdown();
ecore_shutdown();
+ eina_log_domain_unregister(_log_dom);
eina_shutdown();
return _retval;
diff --git a/src/bin/ethumb_client/ethumbd.c b/src/bin/ethumb_client/ethumbd.c
index 02735e34b1..a1790c7be3 100644
--- a/src/bin/ethumb_client/ethumbd.c
+++ b/src/bin/ethumb_client/ethumbd.c
@@ -1755,8 +1755,6 @@ main(int argc, char *argv[])
memset(&ed, 0, sizeof(ed));
ecore_init();
- eina_init();
-
ethumb_init();
if (_log_domain < 0)
@@ -1861,7 +1859,6 @@ main(int argc, char *argv[])
if (_pfx) eina_prefix_free(_pfx);
ethumb_shutdown();
- eina_shutdown();
ecore_shutdown();
return exit_value;
}
diff --git a/src/bin/ethumb_client/ethumbd_client.c
b/src/bin/ethumb_client/ethumbd_client.c
index e81fc2e9a7..d833296f8c 100644
--- a/src/bin/ethumb_client/ethumbd_client.c
+++ b/src/bin/ethumb_client/ethumbd_client.c
@@ -246,7 +246,6 @@ main(int argc, char *argv[])
int i, ret = 0;
ethumb_client_init();
- ecore_init();
Ecore_Getopt_Value values[] = {
ECORE_GETOPT_VALUE_PTR_CAST(opts.geometry),
@@ -323,7 +322,6 @@ main(int argc, char *argv[])
eina_stringshare_del(opts.frame.group);
eina_stringshare_del(opts.frame.swallow);
}
- ecore_shutdown();
ethumb_client_shutdown();
return ret;
--
