fixup init shutdown

This commit is contained in:
Stefan Schmidt 2020-02-06 10:10:43 +01:00
parent a673e4a91d
commit 68d6de4131
5 changed files with 8 additions and 38 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:
ecore_shutdown(); ecore_evas_shutdown();
eet_shutdown();
eina_shutdown();
return real__; return real__;
} }

View File

@ -1289,8 +1289,6 @@ main(int argc, char *argv[])
}; };
ecore_evas_init(); ecore_evas_init();
ecore_init();
eet_init();
elm_init(0, NULL); elm_init(0, NULL);
want_quit = EINA_FALSE; want_quit = EINA_FALSE;
@ -1641,8 +1639,6 @@ main(int argc, char *argv[])
end: end:
elm_shutdown(); elm_shutdown();
eet_shutdown();
ecore_shutdown();
ecore_evas_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])
{ {
@ -1333,7 +1329,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 cleanup; goto end;
} }
argv[0] = strdup(f_output); argv[0] = strdup(f_output);
} }
@ -1357,13 +1353,7 @@ 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(); ecore_evas_shutdown();
eet_shutdown();
eina_shutdown();
return pret; return pret;
} }

View File

@ -391,8 +391,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)
@ -455,9 +454,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));
@ -469,7 +465,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 cleanup; goto end;
} }
Eina_List *dated_fonts = ecore_file_ls(fonts_dir); Eina_List *dated_fonts = ecore_file_ls(fonts_dir);
char *date_dir; char *date_dir;
@ -519,11 +515,7 @@ int main(int argc, char **argv)
pret = 0; pret = 0;
cleanup:
efl_object_shutdown();
evas_shutdown();
end: end:
ecore_shutdown(); ecore_evas_shutdown();
eina_shutdown();
return pret; return pret;
} }