mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix remaining signedness errors

Browse source 
We can change the data type for 'size' but we have to cast len to size_t
for the comparisons with sizeof results.
This commit is contained in:
Kristian Høgsberg 2012-03-30 11:27:02 -04:00
parent 0ca75a4f32
commit 3cddb3c692
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/wayland-client.c
View file

@ -499,8 +499,8 @@ handle_event(struct wl_display *display,
WL_EXPORT void WL_EXPORT void
wl_display_iterate(struct wl_display *display, uint32_t mask) wl_display_iterate(struct wl_display *display, uint32_t mask)
{ {
uint32_t p[2], object, opcode, size; uint32_t p[2], object;
int len; int len, opcode, size;
mask &= display->mask; mask &= display->mask;
if (mask == 0) { if (mask == 0) {
@ -512,7 +512,7 @@ wl_display_iterate(struct wl_display *display, uint32_t mask)
len = wl_connection_data(display->connection, mask); len = wl_connection_data(display->connection, mask);
while (len > 0) { while (len > 0) {
if (len < sizeof p) if ((size_t) len < sizeof p)
break; break;
wl_connection_copy(display->connection, p, sizeof p); wl_connection_copy(display->connection, p, sizeof p);

2
src/wayland-server.c
View file

@ -202,7 +202,7 @@ wl_client_connection_data(int fd, uint32_t mask, void *data)
return 1; return 1;
} }
while (len >= sizeof p) { while ((size_t) len >= sizeof p) {
wl_connection_copy(connection, p, sizeof p); wl_connection_copy(connection, p, sizeof p);
opcode = p[1] & 0xffff; opcode = p[1] & 0xffff;
size = p[1] >> 16; size = p[1] >> 16;