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

diff --git a/src/bin/exactness/exactness.c b/src/bin/exactness/exactness.c
index f4c4e52..47aa438 100644 (file)
--- a/src/bin/exactness/exactness.c
+++ b/src/bin/exactness/exactness.c
@@ -488,9 +488,7 @@ main(int argc, char *argv[])
      ECORE_GETOPT_VALUE_NONE
    };
 
-   ecore_init();
    ecore_evas_init();
-   evas_init();
    _dest_dir = "./";
    _scan_objs = scan_objs;
 
@@ -667,9 +665,7 @@ main(int argc, char *argv[])
 
    _list_file_free(test_list);
 end:
-   evas_shutdown();
    ecore_evas_shutdown();
-   ecore_shutdown();
 
    return ret;
 }

diff --git a/src/bin/exactness/injector.c b/src/bin/exactness/injector.c
index d98c478..8b73ff5 100644 (file)
--- a/src/bin/exactness/injector.c
+++ b/src/bin/exactness/injector.c
@@ -434,9 +434,7 @@ int main(int argc, char **argv)
      ECORE_GETOPT_VALUE_NONE
    };
 
-   eina_init();
-   eet_init();
-   ecore_init();
+   ecore_evas_init();
 
    opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
    if (opt_args < 0)
@@ -464,8 +462,6 @@ int main(int argc, char **argv)
    real__ = efl_loop_exit_code_process(ret__);
    elm_shutdown();
 end:
-   eet_shutdown();
-   eina_shutdown();
+   ecore_evas_shutdown();
    return real__;
 }
-

diff --git a/src/bin/exactness/inspect.c b/src/bin/exactness/inspect.c
index 15242b8..95d504c 100644 (file)
--- a/src/bin/exactness/inspect.c
+++ b/src/bin/exactness/inspect.c
@@ -1284,9 +1284,6 @@ main(int argc, char *argv[])
      ECORE_GETOPT_VALUE_NONE
    };
 
-   ecore_evas_init();
-   ecore_init();
-   eet_init();
    elm_init(0, NULL);
    want_quit = EINA_FALSE;
 
@@ -1637,9 +1634,6 @@ main(int argc, char *argv[])
 
 end:
    elm_shutdown();
-   eet_shutdown();
-   ecore_shutdown();
-   ecore_evas_shutdown();
 
    return ret;
 }

diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index dcffb0e..4ff19ed 100644 (file)
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -1126,9 +1126,7 @@ int main(int argc, char **argv)
      ECORE_GETOPT_VALUE_NONE
    };
 
-   eina_init();
-   eet_init();
-   ecore_init();
+   ecore_evas_init();
 
    opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
    if (opt_args < 0)
@@ -1280,8 +1278,6 @@ int main(int argc, char **argv)
              setenv("FONTCONFIG_FILE", fonts_conf_name, 1);
           }
      }
-   efl_object_init();
-   evas_init();
 
    if (argv[opt_args])
      {
@@ -1358,7 +1354,6 @@ int main(int argc, char **argv)
      }
 
 end:
-   eet_shutdown();
-   eina_shutdown();
+   ecore_evas_shutdown();
    return pret;
 }

diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index f3fd801..a8c592e 100644 (file)
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -389,8 +389,7 @@ int main(int argc, char **argv)
      ECORE_GETOPT_VALUE_NONE
    };
 
-   eina_init();
-   ecore_init();
+   ecore_evas_init();
 
    opt_args = ecore_getopt_parse(&optdesc, values, argc, argv);
    if (opt_args < 0)
@@ -453,9 +452,6 @@ int main(int argc, char **argv)
         goto end;
      }
 
-   efl_object_init();
-   evas_init();
-
    if (!_unit)
      {
         _unit = calloc(1, sizeof(*_unit));
@@ -516,7 +512,8 @@ int main(int argc, char **argv)
    //_events_list = NULL;
 
    pret = 0;
+
 end:
-   eina_shutdown();
+   ecore_evas_shutdown();
    return pret;
 }