server: Use existing id variable when inserting created object
authorJonas Ådahl <jadahl@gmail.com>
Fri, 23 Jan 2015 08:21:15 +0000 (16:21 +0800)
committerBryce Harrington <bryce@osg.samsung.com>
Sat, 24 Jan 2015 02:20:41 +0000 (18:20 -0800)
We already have the id variable there and it makes it slightly easier to
read.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
src/wayland-server.c

index c845dd6..cde1eef 100644 (file)
@@ -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;
        }