mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-02 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src: switch asserts to wl_abort

Browse source 
assert()s can be compiled away by #defining NDEBUG. Some build systems
do this. Using wl_abort gives a human readable error message and it
isn't compiled away. This commit closes issue #230.

Signed-off-by: meltq <tejasvipin76@gmail.com>
This commit is contained in:
meltq 2024-06-30 22:36:11 +05:30 • committed by Tejas Vipin
parent fa1811ce3e
commit 0cecde304f
5 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/wayland-client.c
View file

@ -235,13 +235,16 @@ wl_event_queue_init(struct wl_event_queue *queue,
static void
wl_proxy_unref(struct wl_proxy *proxy)
{
assert(proxy->refcount > 0);
if (!(proxy->refcount > 0))
wl_abort("Proxy requested for unref has no references\n");
if (--proxy->refcount > 0)
return;
/* If we get here, the client must have explicitly requested
* deletion. */
assert(proxy->flags & WL_PROXY_FLAG_DESTROYED);
if (!(proxy->flags & WL_PROXY_FLAG_DESTROYED))
wl_abort("Proxy with no references not yet explicitly"
"destroyed\n");
free(proxy);
}
@ -1172,7 +1175,8 @@ connect_to_socket(const char *name)
"%s", name) + 1;
}
assert(name_size > 0);
if (!(name_size > 0))
wl_abort("Error assigning path name for socket connection\n");
if (name_size > (int)sizeof addr.sun_path) {
if (!path_is_absolute) {
wl_log("error: socket path \"%s/%s\" plus null terminator"
@ -2453,7 +2457,9 @@ wl_proxy_set_queue(struct wl_proxy *proxy, struct wl_event_queue *queue)
wl_list_remove(&proxy->queue_link);
if (queue) {
assert(proxy->display == queue->display);
if (!(proxy->display == queue->display))
wl_abort("Proxy and queue point to different "
"wl_displays");
proxy->queue = queue;
} else {
proxy->queue = &proxy->display->default_queue;
@ -2581,7 +2587,8 @@ wl_proxy_wrapper_destroy(void *proxy_wrapper)
wl_abort("Tried to destroy non-wrapper proxy with "
"wl_proxy_wrapper_destroy\n");
assert(wrapper->refcount == 1);
if (!(wrapper->refcount == 1))
wl_abort("Expected proxy wrapper's refcount to be 1\n");
pthread_mutex_lock(&wrapper->display->mutex);