[PATCH v2 1/2] compositor: Propagate errors from module_init

[Ondřej Majerech]

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 at gmail.com>
---
 src/compositor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 53f6220..8dddd67 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -4423,8 +4423,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++;
-- 
1.9.3