From ab3ee6f6d96c2e9adc3808975fdaf1727e5ff48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 23 Jan 2015 16:21:15 +0800 Subject: [PATCH] server: Use existing id variable when inserting created object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We already have the id variable there and it makes it slightly easier to read. Signed-off-by: Jonas Ådahl Reviewed-by: Bryce Harrington --- src/wayland-server.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/wayland-server.c b/src/wayland-server.c index c845dd68..cde1eef9 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -1313,11 +1313,10 @@ wl_resource_create(struct wl_client *client, resource->version = version; resource->dispatcher = NULL; - if (wl_map_insert_at(&client->objects, 0, resource->object.id, resource) < 0) { + if (wl_map_insert_at(&client->objects, 0, id, resource) < 0) { wl_resource_post_error(client->display_resource, WL_DISPLAY_ERROR_INVALID_OBJECT, - "invalid new id %d", - resource->object.id); + "invalid new id %d", id); free(resource); return NULL; }