shm: remove wl_shm_buffer.pool NULL checks
authorSimon Ser <contact@emersion.fr>
Wed, 2 Jun 2021 14:22:54 +0000 (16:22 +0200)
committerSimon Ser <contact@emersion.fr>
Thu, 10 Jun 2021 14:33:32 +0000 (14:33 +0000)
wl_shm_buffer.pool is never set to NULL. The only time it's set is
in shm_pool_create_buffer, and the pool is guaranteed to be non-NULL
there.

Signed-off-by: Simon Ser <contact@emersion.fr>
src/wayland-shm.c

index 7320bc9..aa64ff3 100644 (file)
@@ -124,8 +124,7 @@ destroy_buffer(struct wl_resource *resource)
 {
        struct wl_shm_buffer *buffer = wl_resource_get_user_data(resource);
 
-       if (buffer->pool)
-               shm_pool_unref(buffer->pool, false);
+       shm_pool_unref(buffer->pool, false);
        free(buffer);
 }
 
@@ -400,11 +399,6 @@ wl_shm_buffer_get_stride(struct wl_shm_buffer *buffer)
 WL_EXPORT void *
 wl_shm_buffer_get_data(struct wl_shm_buffer *buffer)
 {
-       assert(buffer->pool);
-
-       if (!buffer->pool)
-               return NULL;
-
        if (buffer->pool->external_refcount &&
            (buffer->pool->size != buffer->pool->new_size))
                wl_log("Buffer address requested when its parent pool "