summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2013-12-19 02:56:18 (GMT)
committerKristian Høgsberg <krh@bitplanet.net>2014-02-06 04:54:33 (GMT)
commit8fd2520d80eb8e23486134c517ecc03b799ac79d (patch)
treedd4b779e04574ac886607bbbdaa0004571a2d7d7
parenta18e34417ba3fefeb81d891235e8ebf394a20a74 (diff)
downloadwayland-8fd2520d80eb8e23486134c517ecc03b799ac79d.tar.gz
wayland-8fd2520d80eb8e23486134c517ecc03b799ac79d.tar.xz
Rename wl_debug to debug_server/client
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
-rw-r--r--src/wayland-client.c10
-rw-r--r--src/wayland-server.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/wayland-client.c b/src/wayland-client.c
index bbf93ee..0cc9a50 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -94,7 +94,7 @@ struct wl_display {
/** \endcond */
-static int wl_debug = 0;
+static int debug_client = 0;
static void
display_fatal_error(struct wl_display *display, int error)
@@ -469,7 +469,7 @@ wl_proxy_marshal_array_constructor(struct wl_proxy *proxy,
abort();
}
- if (wl_debug)
+ if (debug_client)
wl_closure_print(closure, &proxy->object, true);
if (wl_closure_send(closure, proxy->display->connection)) {
@@ -700,7 +700,7 @@ wl_display_connect_to_fd(int fd)
debug = getenv("WAYLAND_DEBUG");
if (debug && (strstr(debug, "client") || strstr(debug, "1")))
- wl_debug = 1;
+ debug_client = 1;
display = malloc(sizeof *display);
if (display == NULL) {
@@ -1038,13 +1038,13 @@ dispatch_event(struct wl_display *display, struct wl_event_queue *queue)
pthread_mutex_unlock(&display->mutex);
if (proxy->dispatcher) {
- if (wl_debug)
+ if (debug_client)
wl_closure_print(closure, &proxy->object, false);
wl_closure_dispatch(closure, proxy->dispatcher,
&proxy->object, opcode);
} else if (proxy->object.implementation) {
- if (wl_debug)
+ if (debug_client)
wl_closure_print(closure, &proxy->object, false);
wl_closure_invoke(closure, WL_CLOSURE_INVOKE_CLIENT,
diff --git a/src/wayland-server.c b/src/wayland-server.c
index 294497d..431869b 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -117,7 +117,7 @@ struct wl_resource {
wl_dispatcher_func_t dispatcher;
};
-static int wl_debug = 0;
+static int debug_server = 0;
WL_EXPORT void
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))
resource->client->error = 1;
- if (wl_debug)
+ if (debug_server)
wl_closure_print(closure, object, true);
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))
resource->client->error = 1;
- if (wl_debug)
+ if (debug_server)
wl_closure_print(closure, object, true);
wl_closure_destroy(closure);
@@ -324,7 +324,7 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
break;
}
- if (wl_debug)
+ if (debug_server)
wl_closure_print(closure, object, false);
if ((resource_flags & WL_MAP_ENTRY_LEGACY) ||
@@ -798,7 +798,7 @@ wl_display_create(void)
debug = getenv("WAYLAND_DEBUG");
if (debug && (strstr(debug, "server") || strstr(debug, "1")))
- wl_debug = 1;
+ debug_server = 1;
display = malloc(sizeof *display);
if (display == NULL)