static void *
-load_module(const char *name, const char *entrypoint, void **handle)
+load_module(const char *name, const char *entrypoint)
{
char path[PATH_MAX];
void *module, *init;
struct wl_event_source *signals[4];
struct wl_event_loop *loop;
struct sigaction segv_action;
- void *shell_module, *backend_module, *xserver_module;
int (*module_init)(struct weston_compositor *ec);
struct weston_compositor
*(*backend_init)(struct wl_display *display,
config_file = config_file_path("weston.ini");
parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
- backend_init = load_module(backend, "backend_init", &backend_module);
+ backend_init = load_module(backend, "backend_init");
if (!backend_init)
exit(EXIT_FAILURE);
module_init = NULL;
if (xserver)
- module_init = load_module("xwayland.so", "module_init",
- &xserver_module);
+ module_init = load_module("xwayland.so", "module_init");
if (module_init && module_init(ec) < 0) {
ret = EXIT_FAILURE;
goto out;
if (!shell)
shell = "desktop-shell.so";
- module_init = load_module(shell, "module_init", &shell_module);
+ module_init = load_module(shell, "module_init");
if (!module_init || module_init(ec) < 0) {
ret = EXIT_FAILURE;
goto out;
module_init = NULL;
if (module)
- module_init = load_module(module, "module_init", NULL);
+ module_init = load_module(module, "module_init");
if (module_init && module_init(ec) < 0) {
ret = EXIT_FAILURE;
goto out;