diff options
author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-12-02 14:21:46 +0100 |
---|---|---|
committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-01-17 18:24:56 +0100 |
commit | 8af2beccbd91c2f555eb5e5aa4f8e0455ab28eff (patch) | |
tree | c61ab40e34a23215837dc02079250cf6eba5a955 /compositor | |
parent | 3d7ca3b9ea78f59d3d66228d28347c58355bc0e5 (diff) |
weston: Properly namespace modules entrypoint
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'compositor')
-rw-r--r-- | compositor/cms-colord.c | 4 | ||||
-rw-r--r-- | compositor/cms-static.c | 4 | ||||
-rw-r--r-- | compositor/main.c | 27 | ||||
-rw-r--r-- | compositor/screen-share.c | 4 | ||||
-rw-r--r-- | compositor/systemd-notify.c | 4 | ||||
-rw-r--r-- | compositor/weston.h | 9 |
6 files changed, 35 insertions, 17 deletions
diff --git a/compositor/cms-colord.c b/compositor/cms-colord.c index ae3ef25e..0daa2a7e 100644 --- a/compositor/cms-colord.c +++ b/compositor/cms-colord.c @@ -496,8 +496,8 @@ colord_cms_output_destroy(gpointer data) } WL_EXPORT int -module_init(struct weston_compositor *ec, - int *argc, char *argv[]) +wet_module_init(struct weston_compositor *ec, + int *argc, char *argv[]) { gboolean ret; GError *error = NULL; diff --git a/compositor/cms-static.c b/compositor/cms-static.c index a6bbfd46..e24501b6 100644 --- a/compositor/cms-static.c +++ b/compositor/cms-static.c @@ -91,8 +91,8 @@ cms_notifier_destroy(struct wl_listener *listener, void *data) WL_EXPORT int -module_init(struct weston_compositor *ec, - int *argc, char *argv[]) +wet_module_init(struct weston_compositor *ec, + int *argc, char *argv[]) { struct cms_static *cms; struct weston_output *output; diff --git a/compositor/main.c b/compositor/main.c index 2aa4936e..af093f13 100644 --- a/compositor/main.c +++ b/compositor/main.c @@ -761,7 +761,7 @@ weston_create_listening_socket(struct wl_display *display, const char *socket_na } WL_EXPORT void * -wet_load_module(const char *name, const char *entrypoint) +wet_load_module_entrypoint(const char *name, const char *entrypoint) { const char *builddir = getenv("WESTON_BUILD_DIR"); char path[PATH_MAX]; @@ -812,14 +812,28 @@ wet_load_module(const char *name, const char *entrypoint) return init; } + +WL_EXPORT int +wet_load_module(struct weston_compositor *compositor, + const char *name, int *argc, char *argv[]) +{ + int (*module_init)(struct weston_compositor *ec, + int *argc, char *argv[]); + + module_init = wet_load_module_entrypoint(name, "wet_module_init"); + if (!module_init) + return -1; + if (module_init(compositor, argc, argv) < 0) + return -1; + return 0; +} + static int load_modules(struct weston_compositor *ec, const char *modules, int *argc, char *argv[]) { const char *p, *end; char buffer[256]; - int (*module_init)(struct weston_compositor *ec, - int *argc, char *argv[]); if (modules == NULL) return 0; @@ -833,16 +847,13 @@ load_modules(struct weston_compositor *ec, const char *modules, if (wet_load_xwayland(ec) < 0) return -1; } else { - module_init = wet_load_module(buffer, "module_init"); - if (!module_init) - return -1; - if (module_init(ec, argc, argv) < 0) + if (wet_load_module(ec, buffer, argc, argv) < 0) return -1; } + p = end; while (*p == ',') p++; - } return 0; diff --git a/compositor/screen-share.c b/compositor/screen-share.c index 0db02036..bcb9defa 100644 --- a/compositor/screen-share.c +++ b/compositor/screen-share.c @@ -1106,8 +1106,8 @@ share_output_binding(struct weston_keyboard *keyboard, uint32_t time, uint32_t k } WL_EXPORT int -module_init(struct weston_compositor *compositor, - int *argc, char *argv[]) +wet_module_init(struct weston_compositor *compositor, + int *argc, char *argv[]) { struct screen_share *ss; struct weston_config *config = wet_get_config(compositor); diff --git a/compositor/systemd-notify.c b/compositor/systemd-notify.c index ce18ede9..50f03cbc 100644 --- a/compositor/systemd-notify.c +++ b/compositor/systemd-notify.c @@ -115,8 +115,8 @@ weston_compositor_destroy_listener(struct wl_listener *listener, void *data) } WL_EXPORT int -module_init(struct weston_compositor *compositor, - int *argc, char *argv[]) +wet_module_init(struct weston_compositor *compositor, + int *argc, char *argv[]) { char *watchdog_time_env; struct wl_event_loop *loop; diff --git a/compositor/weston.h b/compositor/weston.h index 2e0417c6..6229b34b 100644 --- a/compositor/weston.h +++ b/compositor/weston.h @@ -61,7 +61,14 @@ struct weston_config * wet_get_config(struct weston_compositor *compositor); void * -wet_load_module(const char *name, const char *entrypoint); +wet_load_module_entrypoint(const char *name, const char *entrypoint); + +int +wet_module_init(struct weston_compositor *ec, + int *argc, char *argv[]); +int +wet_load_module(struct weston_compositor *compositor, + const char *name, int *argc, char *argv[]); int module_init(struct weston_compositor *compositor, |