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

libweston: Rename weston_debug_scope_ to weston_log_scope_

Browse Source 
Rename also the functions which work on weston_log_scope.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad
2019-04-17 13:47:06 +03:00
committed by Daniel Stone
parent 5d5e335845
commit 7e4db95373
7 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwayland/launcher.c
+5 -5
View File
@@ -230,7 +230,7 @@ weston_xserver_destroy(struct wl_listener *l, void *data)
if (wxs->loop)
weston_xserver_shutdown(wxs);
weston_debug_scope_destroy(wxs->wm_debug);
weston_compositor_log_scope_destroy(wxs->wm_debug);
free(wxs);
}
@@ -395,10 +395,10 @@ weston_module_init(struct weston_compositor *compositor)
wl_signal_add(&compositor->destroy_signal, &wxs->destroy_listener);
wxs->wm_debug =
weston_compositor_add_debug_scope(wxs->compositor->weston_log_ctx,
"xwm-wm-x11",
"XWM's window management X11 events\n",
NULL, NULL);
weston_compositor_add_log_scope(wxs->compositor->weston_log_ctx,
"xwm-wm-x11",
"XWM's window management X11 events\n",
NULL, NULL);
return 0;
}
xwayland/window-manager.c
+6 -6
View File
@@ -196,7 +196,7 @@ xserver_map_shell_surface(struct weston_wm_window *window,
static bool
wm_debug_is_enabled(struct weston_wm *wm)
{
return weston_debug_scope_is_enabled(wm->server->wm_debug);
return weston_log_scope_is_enabled(wm->server->wm_debug);
}
static void __attribute__ ((format (printf, 2, 3)))
@@ -206,12 +206,12 @@ wm_printf(struct weston_wm *wm, const char *fmt, ...)
char timestr[128];
if (wm_debug_is_enabled(wm))
weston_debug_scope_printf(wm->server->wm_debug, "%s ",
weston_debug_scope_timestamp(wm->server->wm_debug,
weston_log_scope_printf(wm->server->wm_debug, "%s ",
weston_log_scope_timestamp(wm->server->wm_debug,
timestr, sizeof timestr));
va_start(ap, fmt);
weston_debug_scope_vprintf(wm->server->wm_debug, fmt, ap);
weston_log_scope_vprintf(wm->server->wm_debug, fmt, ap);
va_end(ap);
}
static void
@@ -1379,7 +1379,7 @@ weston_wm_handle_property_notify(struct weston_wm *wm, xcb_generic_event_t *even
if (fp) {
fprintf(fp, "%s XCB_PROPERTY_NOTIFY: window %d, ",
weston_debug_scope_timestamp(wm->server->wm_debug,
weston_log_scope_timestamp(wm->server->wm_debug,
timestr, sizeof timestr),
property_notify->window);
if (property_notify->state == XCB_PROPERTY_DELETE)
@@ -1390,7 +1390,7 @@ weston_wm_handle_property_notify(struct weston_wm *wm, xcb_generic_event_t *even
property_notify->atom);
if (fclose(fp) == 0)
weston_debug_scope_write(wm->server->wm_debug,
weston_log_scope_write(wm->server->wm_debug,
logstr, logsize);
free(logstr);
} else {