exactness: fix shutdown handling of efl components in various binaries

The shutdown handling for efl libraries was a bit sloppy in the
exactness binaries. Make sure we shutdown what we init.
This commit is contained in:
Stefan Schmidt 2020-01-31 13:34:23 +01:00
parent 62d0afaf33
commit 2c7961e9ae
3 changed files with 13 additions and 3 deletions

View File

@ -464,8 +464,8 @@ 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:
ecore_shutdown();
eet_shutdown(); eet_shutdown();
eina_shutdown(); eina_shutdown();
return real__; return real__;
} }

View File

@ -1333,7 +1333,7 @@ int main(int argc, char **argv)
if (!f_output) if (!f_output)
{ {
fprintf(stderr, "no program specified\nUse -h for more information\n"); fprintf(stderr, "no program specified\nUse -h for more information\n");
goto end; goto cleanup;
} }
argv[0] = strdup(f_output); argv[0] = strdup(f_output);
} }
@ -1357,7 +1357,12 @@ int main(int argc, char **argv)
exactness_unit_file_write(_dest_unit, _dest); exactness_unit_file_write(_dest_unit, _dest);
} }
cleanup:
evas_shutdown();
efl_object_shutdown();
end: end:
ecore_shutdown();
eet_shutdown(); eet_shutdown();
eina_shutdown(); eina_shutdown();
return pret; return pret;

View File

@ -467,7 +467,7 @@ int main(int argc, char **argv)
if (!ecore_file_exists(fonts_dir)) if (!ecore_file_exists(fonts_dir))
{ {
fprintf(stderr, "Unable to find fonts directory %s\n", fonts_dir); fprintf(stderr, "Unable to find fonts directory %s\n", fonts_dir);
goto end; goto cleanup;
} }
Eina_List *dated_fonts = ecore_file_ls(fonts_dir); Eina_List *dated_fonts = ecore_file_ls(fonts_dir);
char *date_dir; char *date_dir;
@ -516,7 +516,12 @@ int main(int argc, char **argv)
//_events_list = NULL; //_events_list = NULL;
pret = 0; pret = 0;
cleanup:
efl_object_shutdown();
evas_shutdown();
end: end:
ecore_shutdown();
eina_shutdown(); eina_shutdown();
return pret; return pret;
} }