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

libweston: fold weston_compositor_tear_down() into weston_compositor_destroy()

Browse Source 
The only reason why we have both weston_compositor_tear_down() and
weston_compositor_destroy() is that the only we had to destroy
the log context was keeping weston_compositor alive and calling
weston_log_ctx_compositor_destroy().

After commit "weston-log: replace weston_log_ctx_compositor_destroy()
by weston_log_ctx_destroy()", it's not necessary to keep a zombie
weston_compositor just to be able to call
weston_log_ctx_compositor_destroy().

Fold weston_compositor_tear_down() into weston_compositor_destroy(),
as this split is useless now.

Signed-off-by: Leandro Ribeiro <leandrohr@riseup.net>
This commit is contained in:
Leandro Ribeiro
2020-01-27 19:12:01 -03:00
parent 4ec38d18b3
commit ca640d5120
4 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/main.c
+1 -3
View File
@@ -3375,13 +3375,11 @@ out:
if (protologger)
wl_protocol_logger_destroy(protologger);
weston_compositor_destroy(wet.compositor);
weston_log_scope_destroy(protocol_scope);
protocol_scope = NULL;
weston_compositor_tear_down(wet.compositor);
weston_log_scope_destroy(log_scope);
log_scope = NULL;
weston_compositor_destroy(wet.compositor);
weston_log_ctx_destroy(log_ctx);
weston_log_subscriber_destroy_log(logger);
weston_log_subscriber_destroy_flight_rec(flight_rec);