summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-02-06 10:10:43 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2020-02-06 10:10:43 +0100
commit68d6de41313330ec7641f8680cf6f94556945b0b (patch)
tree00cfbc0011e3da66f1550eea5f704e22034203f3
parenta673e4a91dad0d6fbc2789a2d23d2a7b2ff54a16 (diff)
fixup init shutdown
-rw-r--r--src/bin/exactness/exactness.c4
-rw-r--r--src/bin/exactness/injector.c8
-rw-r--r--src/bin/exactness/inspect.c4
-rw-r--r--src/bin/exactness/player.c16
-rw-r--r--src/bin/exactness/recorder.c14
5 files changed, 8 insertions, 38 deletions
diff --git a/src/bin/exactness/exactness.c b/src/bin/exactness/exactness.c
index f4c4e52498..47aa4389c7 100644
--- a/src/bin/exactness/exactness.c
+++ b/src/bin/exactness/exactness.c
@@ -488,9 +488,7 @@ main(int argc, char *argv[])
488 ECORE_GETOPT_VALUE_NONE 488 ECORE_GETOPT_VALUE_NONE
489 }; 489 };
490 490
491 ecore_init();
492 ecore_evas_init(); 491 ecore_evas_init();
493 evas_init();
494 _dest_dir = "./"; 492 _dest_dir = "./";
495 _scan_objs = scan_objs; 493 _scan_objs = scan_objs;
496 494
@@ -667,9 +665,7 @@ main(int argc, char *argv[])
667 665
668 _list_file_free(test_list); 666 _list_file_free(test_list);
669end: 667end:
670 evas_shutdown();
671 ecore_evas_shutdown(); 668 ecore_evas_shutdown();
672 ecore_shutdown();
673 669
674 return ret; 670 return ret;
675} 671}
diff --git a/src/bin/exactness/injector.c b/src/bin/exactness/injector.c
index 2eb82d7bfe..8b73ff5270 100644
--- a/src/bin/exactness/injector.c
+++ b/src/bin/exactness/injector.c
@@ -434,9 +434,7 @@ int main(int argc, char **argv)
434 ECORE_GETOPT_VALUE_NONE 434 ECORE_GETOPT_VALUE_NONE
435 }; 435 };
436 436
437 eina_init(); 437 ecore_evas_init();
438 eet_init();
439 ecore_init();
440 438
441 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv); 439 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
442 if (opt_args < 0) 440 if (opt_args < 0)
@@ -464,8 +462,6 @@ int main(int argc, char **argv)
464 real__ = efl_loop_exit_code_process(ret__); 462 real__ = efl_loop_exit_code_process(ret__);
465 elm_shutdown(); 463 elm_shutdown();
466end: 464end:
467 ecore_shutdown(); 465 ecore_evas_shutdown();
468 eet_shutdown();
469 eina_shutdown();
470 return real__; 466 return real__;
471} 467}
diff --git a/src/bin/exactness/inspect.c b/src/bin/exactness/inspect.c
index 1f06f50795..acc66e1dc9 100644
--- a/src/bin/exactness/inspect.c
+++ b/src/bin/exactness/inspect.c
@@ -1289,8 +1289,6 @@ main(int argc, char *argv[])
1289 }; 1289 };
1290 1290
1291 ecore_evas_init(); 1291 ecore_evas_init();
1292 ecore_init();
1293 eet_init();
1294 elm_init(0, NULL); 1292 elm_init(0, NULL);
1295 want_quit = EINA_FALSE; 1293 want_quit = EINA_FALSE;
1296 1294
@@ -1641,8 +1639,6 @@ main(int argc, char *argv[])
1641 1639
1642end: 1640end:
1643 elm_shutdown(); 1641 elm_shutdown();
1644 eet_shutdown();
1645 ecore_shutdown();
1646 ecore_evas_shutdown(); 1642 ecore_evas_shutdown();
1647 1643
1648 return ret; 1644 return ret;
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index e338c0cba8..4ff19ed8dc 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -1126,9 +1126,7 @@ int main(int argc, char **argv)
1126 ECORE_GETOPT_VALUE_NONE 1126 ECORE_GETOPT_VALUE_NONE
1127 }; 1127 };
1128 1128
1129 eina_init(); 1129 ecore_evas_init();
1130 eet_init();
1131 ecore_init();
1132 1130
1133 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv); 1131 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
1134 if (opt_args < 0) 1132 if (opt_args < 0)
@@ -1280,8 +1278,6 @@ int main(int argc, char **argv)
1280 setenv("FONTCONFIG_FILE", fonts_conf_name, 1); 1278 setenv("FONTCONFIG_FILE", fonts_conf_name, 1);
1281 } 1279 }
1282 } 1280 }
1283 efl_object_init();
1284 evas_init();
1285 1281
1286 if (argv[opt_args]) 1282 if (argv[opt_args])
1287 { 1283 {
@@ -1333,7 +1329,7 @@ int main(int argc, char **argv)
1333 if (!f_output) 1329 if (!f_output)
1334 { 1330 {
1335 fprintf(stderr, "no program specified\nUse -h for more information\n"); 1331 fprintf(stderr, "no program specified\nUse -h for more information\n");
1336 goto cleanup; 1332 goto end;
1337 } 1333 }
1338 argv[0] = strdup(f_output); 1334 argv[0] = strdup(f_output);
1339 } 1335 }
@@ -1357,13 +1353,7 @@ int main(int argc, char **argv)
1357 exactness_unit_file_write(_dest_unit, _dest); 1353 exactness_unit_file_write(_dest_unit, _dest);
1358 } 1354 }
1359 1355
1360cleanup:
1361 evas_shutdown();
1362 efl_object_shutdown();
1363
1364end: 1356end:
1365 ecore_shutdown(); 1357 ecore_evas_shutdown();
1366 eet_shutdown();
1367 eina_shutdown();
1368 return pret; 1358 return pret;
1369} 1359}
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index 3023deffe8..5b529b5b8c 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -391,8 +391,7 @@ int main(int argc, char **argv)
391 ECORE_GETOPT_VALUE_NONE 391 ECORE_GETOPT_VALUE_NONE
392 }; 392 };
393 393
394 eina_init(); 394 ecore_evas_init();
395 ecore_init();
396 395
397 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv); 396 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
398 if (opt_args < 0) 397 if (opt_args < 0)
@@ -455,9 +454,6 @@ int main(int argc, char **argv)
455 goto end; 454 goto end;
456 } 455 }
457 456
458 efl_object_init();
459 evas_init();
460
461 if (!_unit) 457 if (!_unit)
462 { 458 {
463 _unit = calloc(1, sizeof(*_unit)); 459 _unit = calloc(1, sizeof(*_unit));
@@ -469,7 +465,7 @@ int main(int argc, char **argv)
469 if (!ecore_file_exists(fonts_dir)) 465 if (!ecore_file_exists(fonts_dir))
470 { 466 {
471 fprintf(stderr, "Unable to find fonts directory %s\n", fonts_dir); 467 fprintf(stderr, "Unable to find fonts directory %s\n", fonts_dir);
472 goto cleanup; 468 goto end;
473 } 469 }
474 Eina_List *dated_fonts = ecore_file_ls(fonts_dir); 470 Eina_List *dated_fonts = ecore_file_ls(fonts_dir);
475 char *date_dir; 471 char *date_dir;
@@ -519,11 +515,7 @@ int main(int argc, char **argv)
519 515
520 pret = 0; 516 pret = 0;
521 517
522cleanup:
523 efl_object_shutdown();
524 evas_shutdown();
525end: 518end:
526 ecore_shutdown(); 519 ecore_evas_shutdown();
527 eina_shutdown();
528 return pret; 520 return pret;
529} 521}