mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-debug: Remove weston_compositor from weston_log_context

Browse Source 
This is no longer needed. Also assert if the context passed is NULL and
compositor log context is already set.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad
2019-04-17 13:50:28 +03:00
committed by Daniel Stone
parent 7e4db95373
commit 6f098663c0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/weston-debug.c
+2 -5
View File
@@ -46,7 +46,6 @@
* \internal * \internal
*/ */
struct weston_log_context { struct weston_log_context {
struct weston_compositor *compositor;
struct wl_listener compositor_destroy_listener; struct wl_listener compositor_destroy_listener;
struct wl_global *global; struct wl_global *global;
struct wl_list scope_list; /**< weston_log_scope::compositor_link */ struct wl_list scope_list; /**< weston_log_scope::compositor_link */
@@ -266,12 +265,10 @@ int
weston_log_ctx_compositor_setup(struct weston_compositor *compositor, weston_log_ctx_compositor_setup(struct weston_compositor *compositor,
struct weston_log_context *log_ctx) struct weston_log_context *log_ctx)
{ {
if (compositor->weston_log_ctx) assert(!compositor->weston_log_ctx);
return -1; assert(log_ctx);
log_ctx->compositor = compositor;
compositor->weston_log_ctx = log_ctx; compositor->weston_log_ctx = log_ctx;
return 0; return 0;
} }