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-02-07 10:53:21 +0100
commit927155252b31e66d2d40d0437a87446446f87175 (patch)
tree413fbda025246c3d2b57dc822533885c32d1f8e5
parent4d92d6e940dfb662cd3acb6bdea203c1276d3725 (diff)
downloadefl-927155252b31e66d2d40d0437a87446446f87175.tar.gz
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. Differential Revision: https://phab.enlightenment.org/D11289
-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[])
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 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)
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 15242b8d9d..95d504cd83 100644
--- 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 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)
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 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)
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;
}