weston-log: fold weston_log_ctx_compositor_setup() into weston_compositor_create()
The function weston_log_ctx_compositor_setup() is being called only inside
weston_compositor_create() and it is so tiny that the code gets easier to
follow if it gets folded in weston_compositor_create().
Signed-off-by: Leandro Ribeiro <leandrohr@riseup.net>
diff --git a/libweston/compositor.c b/libweston/compositor.c
index de6931a..2f8af3c 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -7203,10 +7203,14 @@
struct weston_compositor *ec;
struct wl_event_loop *loop;
+ if (!log_ctx)
+ return NULL;
+
ec = zalloc(sizeof *ec);
if (!ec)
return NULL;
+ ec->weston_log_ctx = log_ctx;
ec->wl_display = display;
ec->user_data = user_data;
wl_signal_init(&ec->destroy_signal);
@@ -7258,9 +7262,6 @@
ec, bind_presentation))
goto fail;
- if (weston_log_ctx_compositor_setup(ec, log_ctx) < 0)
- goto fail;
-
if (weston_input_init(ec) != 0)
goto fail;