libwayland-server protects us from invalid serial numbers by posting an error already.
MIN() is for clients when selecting interface versions. Signed-off-by: Derek Foreman <[email protected]> --- src/compositor.c | 8 ++++---- src/input.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index 65abb72..3c86f67 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -3883,7 +3883,7 @@ bind_output(struct wl_client *client, struct wl_resource *resource; resource = wl_resource_create(client, &wl_output_interface, - MIN(version, 2), id); + version, id); if (resource == NULL) { wl_client_post_no_memory(client); return; @@ -4369,7 +4369,7 @@ bind_scaler(struct wl_client *client, struct wl_resource *resource; resource = wl_resource_create(client, &wl_scaler_interface, - MIN(version, 2), id); + version, id); if (resource == NULL) { wl_client_post_no_memory(client); return; @@ -4444,7 +4444,7 @@ bind_presentation(struct wl_client *client, struct wl_resource *resource; resource = wl_resource_create(client, &presentation_interface, - MIN(version, 1), id); + version, id); if (resource == NULL) { wl_client_post_no_memory(client); return; @@ -4463,7 +4463,7 @@ compositor_bind(struct wl_client *client, struct wl_resource *resource; resource = wl_resource_create(client, &wl_compositor_interface, - MIN(version, 3), id); + version, id); if (resource == NULL) { wl_client_post_no_memory(client); return; diff --git a/src/input.c b/src/input.c index 1cc2540..097c8e7 100644 --- a/src/input.c +++ b/src/input.c @@ -2142,7 +2142,7 @@ bind_seat(struct wl_client *client, void *data, uint32_t version, uint32_t id) enum wl_seat_capability caps = 0; resource = wl_resource_create(client, - &wl_seat_interface, MIN(version, 4), id); + &wl_seat_interface, version, id); wl_list_insert(&seat->base_resource_list, wl_resource_get_link(resource)); wl_resource_set_implementation(resource, &seat_interface, data, unbind_resource); -- 2.6.2 _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
