From ed92f79655e65f2acd40b99d8c6281a17845d8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 30 Mar 2012 11:31:25 -0400 Subject: [PATCH] Fix warnings resulting from wayland signedness fixes --- src/shell.c | 8 ++++---- src/xserver-launcher.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/shell.c b/src/shell.c index 9cc53d87..02f203a2 100644 --- a/src/shell.c +++ b/src/shell.c @@ -197,7 +197,7 @@ move_grab_motion(struct wl_pointer_grab *grab, static void move_grab_button(struct wl_pointer_grab *grab, - uint32_t time, int32_t button, int32_t state) + uint32_t time, uint32_t button, int32_t state) { struct wl_input_device *device = grab->input_device; @@ -296,7 +296,7 @@ resize_grab_motion(struct wl_pointer_grab *grab, static void resize_grab_button(struct wl_pointer_grab *grab, - uint32_t time, int32_t button, int32_t state) + uint32_t time, uint32_t button, int32_t state) { struct wl_input_device *device = grab->input_device; @@ -675,7 +675,7 @@ popup_grab_motion(struct wl_pointer_grab *grab, static void popup_grab_button(struct wl_pointer_grab *grab, - uint32_t time, int32_t button, int32_t state) + uint32_t time, uint32_t button, int32_t state) { struct wl_resource *resource; struct shell_surface *shsurf = @@ -1315,7 +1315,7 @@ rotate_grab_motion(struct wl_pointer_grab *grab, static void rotate_grab_button(struct wl_pointer_grab *grab, - uint32_t time, int32_t button, int32_t state) + uint32_t time, uint32_t button, int32_t state) { struct rotate_grab *rotate = container_of(grab, struct rotate_grab, grab); diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c index 7fc79d88..33bd7733 100644 --- a/src/xserver-launcher.c +++ b/src/xserver-launcher.c @@ -775,7 +775,7 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data) wm->source_data.size = current + len; if (wm->source_data.size >= incr_chunk_size) { if (!wm->incr) { - fprintf(stderr, "got %d bytes, starting incr\n", + fprintf(stderr, "got %zu bytes, starting incr\n", wm->source_data.size); wm->incr = 1; xcb_change_property(wm->conn, @@ -790,13 +790,13 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data) wl_event_source_remove(wm->property_source); weston_wm_send_selection_notify(wm, wm->selection_request.property); } else if (wm->selection_property_set) { - fprintf(stderr, "got %d bytes, waiting for " + fprintf(stderr, "got %zu bytes, waiting for " "property delete\n", wm->source_data.size); wm->flush_property_on_delete = 1; wl_event_source_remove(wm->property_source); } else { - fprintf(stderr, "got %d bytes, " + fprintf(stderr, "got %zu bytes, " "property deleted, seting new property\n", wm->source_data.size); weston_wm_flush_source_data(wm); @@ -816,10 +816,10 @@ weston_wm_read_data_source(int fd, uint32_t mask, void *data) wm->flush_property_on_delete = 1; if (wm->selection_property_set) { - fprintf(stderr, "got %d bytes, waiting for " + fprintf(stderr, "got %zu bytes, waiting for " "property delete\n", wm->source_data.size); } else { - fprintf(stderr, "got %d bytes, " + fprintf(stderr, "got %zu bytes, " "property deleted, seting new property\n", wm->source_data.size); weston_wm_flush_source_data(wm); @@ -869,7 +869,7 @@ weston_wm_send_incr_chunk(struct weston_wm *wm) wm->selection_property_set = 0; if (wm->flush_property_on_delete) { - fprintf(stderr, "setting new property, %d bytes\n", + fprintf(stderr, "setting new property, %zu bytes\n", wm->source_data.size); wm->flush_property_on_delete = 0; length = weston_wm_flush_source_data(wm);