commit 712ba320db29923197158905703cc81fa9b0b3e5
author Derek Foreman <derekf@osg.samsung.com> Thu Dec 28 15:28:11 2017 +0000
committer Daniel Stone <daniels@collabora.com> Thu Dec 28 19:43:20 2017 +0000
tree c6fe81984c3beafd513a107dfb62a77fba158f51
parent 07d7a9968d9bf258794964584f68777686c90748

client: Restructure delete_id handler control flow

This makes it easier for future patches in the series, which can
possibly return NULL for extant map entries.

[daniels: Extracted from Derek's bespoke-zombie patch as an intermediate
          step.]

Reviewed-by: Daniel Stone <daniels@collabora.com>

src/wayland-client.c

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 8fc5634..83f76ec 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -836,13 +836,12 @@
 
 	proxy = wl_map_lookup(&display->objects, id);
 
-	if (!proxy)
-		wl_log("error: received delete_id for unknown id (%u)\n", id);
-
-	if (proxy && !wl_object_is_zombie(&display->objects, id))
+	if (wl_object_is_zombie(&display->objects, id))
+		wl_map_remove(&display->objects, id);
+	else if (proxy)
 		proxy->flags |= WL_PROXY_FLAG_ID_DELETED;
 	else
-		wl_map_remove(&display->objects, id);
+		wl_log("error: received delete_id for unknown id (%u)\n", id);
 
 	pthread_mutex_unlock(&display->mutex);
 }