fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-03 14:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Propagate errors from module_init

Browse source 
load_modules currently ignores errors signalled by both
weston_load_module and module_init, and instead always returns 0. Its
return value appears to be checked in callers, so we most likely want to
propagate any errors.

Signed-off-by: Ondřej Majerech <majerech.o@gmail.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Ondřej Majerech 2014-12-06 02:49:17 +01:00 • committed by Pekka Paalanen
parent 389a10d705
commit 01e98b65c6
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/compositor.c
View file

@ -4479,8 +4479,10 @@ load_modules(struct weston_compositor *ec, const char *modules,
end = strchrnul(p, ',');
snprintf(buffer, sizeof buffer, "%.*s", (int) (end - p), p);
module_init = weston_load_module(buffer, "module_init");
if (module_init)
module_init(ec, argc, argv);
if (!module_init)
return -1;
if (module_init(ec, argc, argv) < 0)
return -1;
p = end;
while (*p == ',')
p++;