summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-01-31 13:34:23 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2020-02-07 11:31:25 +0100
commit248f3d9d6b12f3cf3c3aeee8ed0a3c153958f62b (patch)
tree413fbda025246c3d2b57dc822533885c32d1f8e5 /src/bin
parent6a4e297ec8850bed5eceee65642e997e35a20277 (diff)
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
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/exactness/exactness.c4
-rw-r--r--src/bin/exactness/injector.c8
-rw-r--r--src/bin/exactness/inspect.c6
-rw-r--r--src/bin/exactness/player.c9
-rw-r--r--src/bin/exactness/recorder.c9
5 files changed, 7 insertions, 29 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 d98c478bde..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 eet_shutdown(); 465 ecore_evas_shutdown();
468 eina_shutdown();
469 return real__; 466 return real__;
470} 467}
471
diff --git a/src/bin/exactness/inspect.c b/src/bin/exactness/inspect.c
index 15242b8d9d..95d504cd83 100644
--- a/src/bin/exactness/inspect.c
+++ b/src/bin/exactness/inspect.c
@@ -1284,9 +1284,6 @@ main(int argc, char *argv[])
1284 ECORE_GETOPT_VALUE_NONE 1284 ECORE_GETOPT_VALUE_NONE
1285 }; 1285 };
1286 1286
1287 ecore_evas_init();
1288 ecore_init();
1289 eet_init();
1290 elm_init(0, NULL); 1287 elm_init(0, NULL);
1291 want_quit = EINA_FALSE; 1288 want_quit = EINA_FALSE;
1292 1289
@@ -1637,9 +1634,6 @@ main(int argc, char *argv[])
1637 1634
1638end: 1635end:
1639 elm_shutdown(); 1636 elm_shutdown();
1640 eet_shutdown();
1641 ecore_shutdown();
1642 ecore_evas_shutdown();
1643 1637
1644 return ret; 1638 return ret;
1645} 1639}
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index dcffb0e2df..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 {
@@ -1358,7 +1354,6 @@ int main(int argc, char **argv)
1358 } 1354 }
1359 1355
1360end: 1356end:
1361 eet_shutdown(); 1357 ecore_evas_shutdown();
1362 eina_shutdown();
1363 return pret; 1358 return pret;
1364} 1359}
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index f3fd80148f..a8c592e111 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -389,8 +389,7 @@ int main(int argc, char **argv)
389 ECORE_GETOPT_VALUE_NONE 389 ECORE_GETOPT_VALUE_NONE
390 }; 390 };
391 391
392 eina_init(); 392 ecore_evas_init();
393 ecore_init();
394 393
395 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv); 394 opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
396 if (opt_args < 0) 395 if (opt_args < 0)
@@ -453,9 +452,6 @@ int main(int argc, char **argv)
453 goto end; 452 goto end;
454 } 453 }
455 454
456 efl_object_init();
457 evas_init();
458
459 if (!_unit) 455 if (!_unit)
460 { 456 {
461 _unit = calloc(1, sizeof(*_unit)); 457 _unit = calloc(1, sizeof(*_unit));
@@ -516,7 +512,8 @@ int main(int argc, char **argv)
516 //_events_list = NULL; 512 //_events_list = NULL;
517 513
518 pret = 0; 514 pret = 0;
515
519end: 516end:
520 eina_shutdown(); 517 ecore_evas_shutdown();
521 return pret; 518 return pret;
522} 519}