exactness: fix init/shutdown handling of efl components in various binaries

The init/shutdown handling for efl libraries was a bit sloppy and
unbalanced in the exactness binaries. Switching over to use
ecore_eas_init/shutdown here instead of doing all libs individually.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D11289
This commit is contained in:
Stefan Schmidt 2020-01-31 13:34:23 +01:00
parent 6a4e297ec8
commit 248f3d9d6b
5 changed files with 7 additions and 29 deletions

View File

@ -488,9 +488,7 @@ main(int argc, char *argv[])
ECORE_GETOPT_VALUE_NONE ECORE_GETOPT_VALUE_NONE
}; };
ecore_init();
ecore_evas_init(); ecore_evas_init();
evas_init();
_dest_dir = "./"; _dest_dir = "./";
_scan_objs = scan_objs; _scan_objs = scan_objs;
@ -667,9 +665,7 @@ main(int argc, char *argv[])
_list_file_free(test_list); _list_file_free(test_list);
end: end:
evas_shutdown();
ecore_evas_shutdown(); ecore_evas_shutdown();
ecore_shutdown();
return ret; return ret;
} }

View File

@ -434,9 +434,7 @@ int main(int argc, char **argv)
ECORE_GETOPT_VALUE_NONE ECORE_GETOPT_VALUE_NONE
}; };
eina_init(); ecore_evas_init();
eet_init();
ecore_init();
opt_args = ecore_getopt_parse(&optdesc, values, argc, argv); opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
if (opt_args < 0) if (opt_args < 0)
@ -464,8 +462,6 @@ int main(int argc, char **argv)
real__ = efl_loop_exit_code_process(ret__); real__ = efl_loop_exit_code_process(ret__);
elm_shutdown(); elm_shutdown();
end: end:
eet_shutdown(); ecore_evas_shutdown();
eina_shutdown();
return real__; return real__;
} }

View File

@ -1284,9 +1284,6 @@ main(int argc, char *argv[])
ECORE_GETOPT_VALUE_NONE ECORE_GETOPT_VALUE_NONE
}; };
ecore_evas_init();
ecore_init();
eet_init();
elm_init(0, NULL); elm_init(0, NULL);
want_quit = EINA_FALSE; want_quit = EINA_FALSE;
@ -1637,9 +1634,6 @@ main(int argc, char *argv[])
end: end:
elm_shutdown(); elm_shutdown();
eet_shutdown();
ecore_shutdown();
ecore_evas_shutdown();
return ret; return ret;
} }

View File

@ -1126,9 +1126,7 @@ int main(int argc, char **argv)
ECORE_GETOPT_VALUE_NONE ECORE_GETOPT_VALUE_NONE
}; };
eina_init(); ecore_evas_init();
eet_init();
ecore_init();
opt_args = ecore_getopt_parse(&optdesc, values, argc, argv); opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
if (opt_args < 0) if (opt_args < 0)
@ -1280,8 +1278,6 @@ int main(int argc, char **argv)
setenv("FONTCONFIG_FILE", fonts_conf_name, 1); setenv("FONTCONFIG_FILE", fonts_conf_name, 1);
} }
} }
efl_object_init();
evas_init();
if (argv[opt_args]) if (argv[opt_args])
{ {
@ -1358,7 +1354,6 @@ int main(int argc, char **argv)
} }
end: end:
eet_shutdown(); ecore_evas_shutdown();
eina_shutdown();
return pret; return pret;
} }

View File

@ -389,8 +389,7 @@ int main(int argc, char **argv)
ECORE_GETOPT_VALUE_NONE ECORE_GETOPT_VALUE_NONE
}; };
eina_init(); ecore_evas_init();
ecore_init();
opt_args = ecore_getopt_parse(&optdesc, values, argc, argv); opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
if (opt_args < 0) if (opt_args < 0)
@ -453,9 +452,6 @@ int main(int argc, char **argv)
goto end; goto end;
} }
efl_object_init();
evas_init();
if (!_unit) if (!_unit)
{ {
_unit = calloc(1, sizeof(*_unit)); _unit = calloc(1, sizeof(*_unit));
@ -516,7 +512,8 @@ int main(int argc, char **argv)
//_events_list = NULL; //_events_list = NULL;
pret = 0; pret = 0;
end: end:
eina_shutdown(); ecore_evas_shutdown();
return pret; return pret;
} }