summaryrefslogtreecommitdiff
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-01-31 14:14:01 +0100
commit3def8bf571b7606df67b68663916aa53aea57159 (patch)
treeca13d03084cac5538b55ba63449daef92bc916bd
parent5ba73b01075bcc4353d8129df6015dcdd29b17e3 (diff)
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.
-rw-r--r--src/bin/exactness/injector.c2
-rw-r--r--src/bin/exactness/player.c7
-rw-r--r--src/bin/exactness/recorder.c7
3 files changed, 13 insertions, 3 deletions
diff --git a/src/bin/exactness/injector.c b/src/bin/exactness/injector.c
index d98c478bde..2eb82d7bfe 100644
--- a/src/bin/exactness/injector.c
+++ b/src/bin/exactness/injector.c
@@ -464,8 +464,8 @@ int main(int argc, char **argv)
464 real__ = efl_loop_exit_code_process(ret__); 464 real__ = efl_loop_exit_code_process(ret__);
465 elm_shutdown(); 465 elm_shutdown();
466end: 466end:
467 ecore_shutdown();
467 eet_shutdown(); 468 eet_shutdown();
468 eina_shutdown(); 469 eina_shutdown();
469 return real__; 470 return real__;
470} 471}
471
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index dcffb0e2df..e338c0cba8 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -1333,7 +1333,7 @@ int main(int argc, char **argv)
1333 if (!f_output) 1333 if (!f_output)
1334 { 1334 {
1335 fprintf(stderr, "no program specified\nUse -h for more information\n"); 1335 fprintf(stderr, "no program specified\nUse -h for more information\n");
1336 goto end; 1336 goto cleanup;
1337 } 1337 }
1338 argv[0] = strdup(f_output); 1338 argv[0] = strdup(f_output);
1339 } 1339 }
@@ -1357,7 +1357,12 @@ int main(int argc, char **argv)
1357 exactness_unit_file_write(_dest_unit, _dest); 1357 exactness_unit_file_write(_dest_unit, _dest);
1358 } 1358 }
1359 1359
1360cleanup:
1361 evas_shutdown();
1362 efl_object_shutdown();
1363
1360end: 1364end:
1365 ecore_shutdown();
1361 eet_shutdown(); 1366 eet_shutdown();
1362 eina_shutdown(); 1367 eina_shutdown();
1363 return pret; 1368 return pret;
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index f3fd80148f..895d3f88f2 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -467,7 +467,7 @@ int main(int argc, char **argv)
467 if (!ecore_file_exists(fonts_dir)) 467 if (!ecore_file_exists(fonts_dir))
468 { 468 {
469 fprintf(stderr, "Unable to find fonts directory %s\n", fonts_dir); 469 fprintf(stderr, "Unable to find fonts directory %s\n", fonts_dir);
470 goto end; 470 goto cleanup;
471 } 471 }
472 Eina_List *dated_fonts = ecore_file_ls(fonts_dir); 472 Eina_List *dated_fonts = ecore_file_ls(fonts_dir);
473 char *date_dir; 473 char *date_dir;
@@ -516,7 +516,12 @@ int main(int argc, char **argv)
516 //_events_list = NULL; 516 //_events_list = NULL;
517 517
518 pret = 0; 518 pret = 0;
519
520cleanup:
521 efl_object_shutdown();
522 evas_shutdown();
519end: 523end:
524 ecore_shutdown();
520 eina_shutdown(); 525 eina_shutdown();
521 return pret; 526 return pret;
522} 527}