[PATCH 2/2] Remove incorrect sanity-check from wl_map_insert_at

Jason Ekstrand jason at jlekstrand.net
Wed Jun 5 14:39:51 PDT 2013


I got a little over-eager with my sanity checks and didn't realize that the
client uses wl_map_insert_at to mark objects as zombies when they come from
the server-side.

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
---
 src/wayland-util.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/wayland-util.c b/src/wayland-util.c
index 7a0b268..4fe9c81 100644
--- a/src/wayland-util.c
+++ b/src/wayland-util.c
@@ -211,14 +211,8 @@ wl_map_insert_at(struct wl_map *map, uint32_t flags, uint32_t i, void *data)
 	struct wl_array *entries;
 
 	if (i < WL_SERVER_ID_START) {
-		if (map->side == WL_MAP_CLIENT_SIDE)
-			return -1;
-
 		entries = &map->client_entries;
 	} else {
-		if (map->side == WL_MAP_SERVER_SIDE)
-			return -1;
-
 		entries = &map->server_entries;
 		i -= WL_SERVER_ID_START;
 	}
-- 
1.8.1.4



More information about the wayland-devel mailing list