mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-04-05 07:15:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename wl_debug to debug_server/client

Browse source 
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Jason Ekstrand 2013-12-18 20:56:18 -06:00 • committed by Kristian Høgsberg
parent a18e34417b
commit 8fd2520d80
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/wayland-client.c
View file

@ -94,7 +94,7 @@ struct wl_display {
/** \endcond */ /** \endcond */
static int wl_debug = 0; static int debug_client = 0;
static void static void
display_fatal_error(struct wl_display *display, int error) display_fatal_error(struct wl_display *display, int error)
@ -469,7 +469,7 @@ wl_proxy_marshal_array_constructor(struct wl_proxy *proxy,
abort(); abort();
} }
if (wl_debug) if (debug_client)
wl_closure_print(closure, &proxy->object, true); wl_closure_print(closure, &proxy->object, true);
if (wl_closure_send(closure, proxy->display->connection)) { if (wl_closure_send(closure, proxy->display->connection)) {
@ -700,7 +700,7 @@ wl_display_connect_to_fd(int fd)
debug = getenv("WAYLAND_DEBUG"); debug = getenv("WAYLAND_DEBUG");
if (debug && (strstr(debug, "client") || strstr(debug, "1"))) if (debug && (strstr(debug, "client") || strstr(debug, "1")))
wl_debug = 1; debug_client = 1;
display = malloc(sizeof *display); display = malloc(sizeof *display);
if (display == NULL) { if (display == NULL) {
@ -1038,13 +1038,13 @@ dispatch_event(struct wl_display *display, struct wl_event_queue *queue)
pthread_mutex_unlock(&display->mutex); pthread_mutex_unlock(&display->mutex);
if (proxy->dispatcher) { if (proxy->dispatcher) {
if (wl_debug) if (debug_client)
wl_closure_print(closure, &proxy->object, false); wl_closure_print(closure, &proxy->object, false);
wl_closure_dispatch(closure, proxy->dispatcher, wl_closure_dispatch(closure, proxy->dispatcher,
&proxy->object, opcode); &proxy->object, opcode);
} else if (proxy->object.implementation) { } else if (proxy->object.implementation) {
if (wl_debug) if (debug_client)
wl_closure_print(closure, &proxy->object, false); wl_closure_print(closure, &proxy->object, false);
wl_closure_invoke(closure, WL_CLOSURE_INVOKE_CLIENT, wl_closure_invoke(closure, WL_CLOSURE_INVOKE_CLIENT,

10
src/wayland-server.c
View file

@ -117,7 +117,7 @@ struct wl_resource {
wl_dispatcher_func_t dispatcher; wl_dispatcher_func_t dispatcher;
}; };
static int wl_debug = 0; static int debug_server = 0;
WL_EXPORT void WL_EXPORT void
wl_resource_post_event_array(struct wl_resource *resource, uint32_t opcode, wl_resource_post_event_array(struct wl_resource *resource, uint32_t opcode,
@ -137,7 +137,7 @@ wl_resource_post_event_array(struct wl_resource *resource, uint32_t opcode,
if (wl_closure_send(closure, resource->client->connection)) if (wl_closure_send(closure, resource->client->connection))
resource->client->error = 1; resource->client->error = 1;
if (wl_debug) if (debug_server)
wl_closure_print(closure, object, true); wl_closure_print(closure, object, true);
wl_closure_destroy(closure); wl_closure_destroy(closure);
@ -177,7 +177,7 @@ wl_resource_queue_event_array(struct wl_resource *resource, uint32_t opcode,
if (wl_closure_queue(closure, resource->client->connection)) if (wl_closure_queue(closure, resource->client->connection))
resource->client->error = 1; resource->client->error = 1;
if (wl_debug) if (debug_server)
wl_closure_print(closure, object, true); wl_closure_print(closure, object, true);
wl_closure_destroy(closure); wl_closure_destroy(closure);
@ -324,7 +324,7 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
break; break;
} }
if (wl_debug) if (debug_server)
wl_closure_print(closure, object, false); wl_closure_print(closure, object, false);
if ((resource_flags & WL_MAP_ENTRY_LEGACY) || if ((resource_flags & WL_MAP_ENTRY_LEGACY) ||
@ -798,7 +798,7 @@ wl_display_create(void)
debug = getenv("WAYLAND_DEBUG"); debug = getenv("WAYLAND_DEBUG");
if (debug && (strstr(debug, "server") || strstr(debug, "1"))) if (debug && (strstr(debug, "server") || strstr(debug, "1")))
wl_debug = 1; debug_server = 1;
display = malloc(sizeof *display); display = malloc(sizeof *display);
if (display == NULL) if (display == NULL)