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

weston-log: rename the confusing function name weston_compositor_log_scope_destroy()

Browse Source 
There's a function named weston_compositor_log_scope_destroy()
but it doesn't take a struct weston_compositor argument.

Rename it to weston_log_scope_destroy(), as the argument is a
struct weston_log_scope.

Signed-off-by: Leandro Ribeiro <leandrohr@riseup.net>
This commit is contained in:
Leandro Ribeiro 2019-12-18 15:52:18 -03:00
parent 5976dbbbb5
commit f014964f6f
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compositor/main.c
View File

@ -3375,11 +3375,11 @@ out:
if (protologger)
wl_protocol_logger_destroy(protologger);
weston_compositor_log_scope_destroy(protocol_scope);
weston_log_scope_destroy(protocol_scope);
protocol_scope = NULL;
weston_compositor_tear_down(wet.compositor);
weston_compositor_log_scope_destroy(log_scope);
weston_log_scope_destroy(log_scope);
log_scope = NULL;
weston_log_ctx_compositor_destroy(wet.compositor);
weston_compositor_destroy(wet.compositor);

2
doc/sphinx/toc/libweston/log.rst
View File

@ -39,7 +39,7 @@ scope.
important for the subscription part, detailed bit later.
Log scopes are managed **explicitly**, and destroying the scope is done using
:func:`weston_compositor_log_scope_destroy`.
:func:`weston_log_scope_destroy`.
Available scopes in weston
~~~~~~~~~~~~~~~~~~~~~~~~~~

2
include/libweston/weston-log.h
View File

@ -71,7 +71,7 @@ weston_log_ctx_add_log_scope(struct weston_log_context *log_ctx,
void *user_data);
void
weston_compositor_log_scope_destroy(struct weston_log_scope *scope);
weston_log_scope_destroy(struct weston_log_scope *scope);
bool
weston_log_scope_is_enabled(struct weston_log_scope *scope);

2
libweston/backend-drm/drm.c
View File

@ -2387,7 +2387,7 @@ drm_destroy(struct weston_compositor *ec)
destroy_sprites(b);
weston_compositor_log_scope_destroy(b->debug);
weston_log_scope_destroy(b->debug);
b->debug = NULL;
weston_compositor_shutdown(ec);

4
libweston/compositor.c
View File

@ -7699,10 +7699,10 @@ weston_compositor_tear_down(struct weston_compositor *compositor)
if (compositor->heads_changed_source)
wl_event_source_remove(compositor->heads_changed_source);
weston_compositor_log_scope_destroy(compositor->debug_scene);
weston_log_scope_destroy(compositor->debug_scene);
compositor->debug_scene = NULL;
weston_compositor_log_scope_destroy(compositor->timeline);
weston_log_scope_destroy(compositor->timeline);
compositor->timeline = NULL;
}

2
libweston/content-protection.c
View File

@ -186,7 +186,7 @@ cp_destroy_listener(struct wl_listener *listener, void *data)
destroy_listener);
wl_list_remove(&cp->destroy_listener.link);
wl_list_remove(&cp->protected_list);
weston_compositor_log_scope_destroy(cp->debug);
weston_log_scope_destroy(cp->debug);
cp->debug = NULL;
cp->surface_protection_update = NULL;
free(cp);

6
libweston/weston-log.c
View File

@ -573,7 +573,7 @@ weston_compositor_is_debug_protocol_enabled(struct weston_compositor *wc)
* against the scope being created and if found will be added to the scope's
* subscription list.
*
* The log scope must be destroyed using weston_compositor_log_scope_destroy()
* The log scope must be destroyed using weston_log_scope_destroy()
* before destroying the weston_compositor.
*
* @memberof weston_log_scope
@ -654,7 +654,7 @@ weston_log_ctx_add_log_scope(struct weston_log_context *log_ctx,
* @memberof weston_log_scope
*/
WL_EXPORT void
weston_compositor_log_scope_destroy(struct weston_log_scope *scope)
weston_log_scope_destroy(struct weston_log_scope *scope)
{
struct weston_log_subscription *sub, *sub_tmp;
@ -726,7 +726,7 @@ weston_log_subscription_complete(struct weston_log_subscription *sub)
* stream. Particularly useful for the weston-debug protocol.
*
* @memberof weston_log_scope
* @sa weston_log_ctx_add_log_scope, weston_compositor_log_scope_destroy
* @sa weston_log_ctx_add_log_scope, weston_log_scope_destroy
*/
WL_EXPORT void
weston_log_scope_complete(struct weston_log_scope *scope)

2
pipewire/pipewire-plugin.c
View File

@ -648,7 +648,7 @@ weston_pipewire_destroy(struct wl_listener *l, void *data)
struct weston_pipewire *pipewire =
wl_container_of(l, pipewire, destroy_listener);
weston_compositor_log_scope_destroy(pipewire->debug);
weston_log_scope_destroy(pipewire->debug);
pipewire->debug = NULL;
wl_event_source_remove(pipewire->loop_source);

2
xwayland/launcher.c
View File

@ -230,7 +230,7 @@ weston_xserver_destroy(struct wl_listener *l, void *data)
if (wxs->loop)
weston_xserver_shutdown(wxs);
weston_compositor_log_scope_destroy(wxs->wm_debug);
weston_log_scope_destroy(wxs->wm_debug);
free(wxs);
}