forked from enlightenment/efl
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
This commit is contained in:
parent
994904098c
commit
e4866ae3ff
|
@ -128,7 +128,6 @@ main(int argc, char *argv[])
|
||||||
eina_init();
|
eina_init();
|
||||||
_log_dom = eina_log_domain_register(argv[0], EINA_COLOR_CYAN);
|
_log_dom = eina_log_domain_register(argv[0], EINA_COLOR_CYAN);
|
||||||
|
|
||||||
ecore_init();
|
|
||||||
ecore_evas_init();
|
ecore_evas_init();
|
||||||
|
|
||||||
arg_index = ecore_getopt_parse(&optdesc, values, argc, argv);
|
arg_index = ecore_getopt_parse(&optdesc, values, argc, argv);
|
||||||
|
@ -211,7 +210,8 @@ main(int argc, char *argv[])
|
||||||
end:
|
end:
|
||||||
if (flags) eina_strbuf_free(flags);
|
if (flags) eina_strbuf_free(flags);
|
||||||
ecore_evas_shutdown();
|
ecore_evas_shutdown();
|
||||||
ecore_shutdown();
|
eina_log_domain_unregister(_log_dom);
|
||||||
|
eina_shutdown();
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
|
@ -274,9 +274,7 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
eina_init();
|
|
||||||
eet_init();
|
eet_init();
|
||||||
evas_init();
|
|
||||||
ecore_evas_init();
|
ecore_evas_init();
|
||||||
|
|
||||||
scratch_canvas_init();
|
scratch_canvas_init();
|
||||||
|
@ -285,8 +283,6 @@ main(int argc, char **argv)
|
||||||
if (ef) eet_close(ef);
|
if (ef) eet_close(ef);
|
||||||
|
|
||||||
ecore_evas_shutdown();
|
ecore_evas_shutdown();
|
||||||
evas_shutdown();
|
|
||||||
eet_shutdown();
|
eet_shutdown();
|
||||||
eina_shutdown();
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -440,17 +440,6 @@ int
|
||||||
main(int argc,
|
main(int argc,
|
||||||
char **argv)
|
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)
|
if (argc < 2)
|
||||||
{
|
{
|
||||||
help:
|
help:
|
||||||
|
@ -468,6 +457,17 @@ help:
|
||||||
" eet -h print out this help message\n"
|
" eet -h print out this help message\n"
|
||||||
" eet -V [--version] show program version\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();
|
eet_shutdown();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -254,7 +254,6 @@ EINA_DEBUG_OPCODES_ARRAY_DEFINE(ops,
|
||||||
int
|
int
|
||||||
main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
|
main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
|
||||||
{
|
{
|
||||||
eina_init();
|
|
||||||
ecore_init();
|
ecore_init();
|
||||||
|
|
||||||
my_argc = argc;
|
my_argc = argc;
|
||||||
|
@ -271,7 +270,6 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
|
||||||
ecore_main_loop_begin();
|
ecore_main_loop_begin();
|
||||||
|
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
eina_shutdown();
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -663,11 +663,11 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
|
||||||
ecore_app_no_system_modules();
|
ecore_app_no_system_modules();
|
||||||
|
|
||||||
eina_init();
|
eina_init();
|
||||||
|
_log_dom = eina_log_domain_register("efl_debugd", EINA_COLOR_CYAN);
|
||||||
ecore_init();
|
ecore_init();
|
||||||
ecore_con_init();
|
ecore_con_init();
|
||||||
|
|
||||||
_retval = EXIT_SUCCESS;
|
_retval = EXIT_SUCCESS;
|
||||||
_log_dom = eina_log_domain_register("efl_debugd", EINA_COLOR_CYAN);
|
|
||||||
|
|
||||||
_string_to_opcode_hash = eina_hash_string_superfast_new(NULL);
|
_string_to_opcode_hash = eina_hash_string_superfast_new(NULL);
|
||||||
_opcode_register("Daemon/opcode_register", EINA_DEBUG_OPCODE_REGISTER, _opcode_register_cb);
|
_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_con_shutdown();
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
|
eina_log_domain_unregister(_log_dom);
|
||||||
eina_shutdown();
|
eina_shutdown();
|
||||||
|
|
||||||
return _retval;
|
return _retval;
|
||||||
|
|
|
@ -1755,8 +1755,6 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
memset(&ed, 0, sizeof(ed));
|
memset(&ed, 0, sizeof(ed));
|
||||||
ecore_init();
|
ecore_init();
|
||||||
eina_init();
|
|
||||||
|
|
||||||
ethumb_init();
|
ethumb_init();
|
||||||
|
|
||||||
if (_log_domain < 0)
|
if (_log_domain < 0)
|
||||||
|
@ -1861,7 +1859,6 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
if (_pfx) eina_prefix_free(_pfx);
|
if (_pfx) eina_prefix_free(_pfx);
|
||||||
ethumb_shutdown();
|
ethumb_shutdown();
|
||||||
eina_shutdown();
|
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
return exit_value;
|
return exit_value;
|
||||||
}
|
}
|
||||||
|
|
|
@ -246,7 +246,6 @@ main(int argc, char *argv[])
|
||||||
int i, ret = 0;
|
int i, ret = 0;
|
||||||
|
|
||||||
ethumb_client_init();
|
ethumb_client_init();
|
||||||
ecore_init();
|
|
||||||
|
|
||||||
Ecore_Getopt_Value values[] = {
|
Ecore_Getopt_Value values[] = {
|
||||||
ECORE_GETOPT_VALUE_PTR_CAST(opts.geometry),
|
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.group);
|
||||||
eina_stringshare_del(opts.frame.swallow);
|
eina_stringshare_del(opts.frame.swallow);
|
||||||
}
|
}
|
||||||
ecore_shutdown();
|
|
||||||
ethumb_client_shutdown();
|
ethumb_client_shutdown();
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in New Issue