From b4c3b8a58625503c4d9e2dc32e79909bc1144984 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 7 Nov 2010 12:19:18 +0200 Subject: server/red_channel: reflect SpiceDataHeader fields in handle_parsed_proc --- server/inputs_channel.c | 2 +- server/main_channel.c | 2 +- server/red_channel.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'server') diff --git a/server/inputs_channel.c b/server/inputs_channel.c index 9372c6f2..c930d4db 100644 --- a/server/inputs_channel.c +++ b/server/inputs_channel.c @@ -290,7 +290,7 @@ static void inputs_channel_send_item(RedChannel *channel, PipeItem *base) red_channel_begin_send_message(channel); } -static int inputs_channel_handle_parsed(RedChannel *channel, size_t size, uint32_t type, void *message) +static int inputs_channel_handle_parsed(RedChannel *channel, uint32_t size, uint16_t type, void *message) { InputsChannel *inputs_channel = (InputsChannel *)channel; uint8_t *buf = (uint8_t *)message; diff --git a/server/main_channel.c b/server/main_channel.c index 626189b3..67ac72f0 100644 --- a/server/main_channel.c +++ b/server/main_channel.c @@ -655,7 +655,7 @@ static void main_channel_release_pipe_item(RedChannel *channel, free(base); } -static int main_channel_handle_parsed(RedChannel *channel, size_t size, uint32_t type, void *message) +static int main_channel_handle_parsed(RedChannel *channel, uint32_t size, uint16_t type, void *message) { MainChannel *main_chan = SPICE_CONTAINEROF(channel, MainChannel, base); diff --git a/server/red_channel.h b/server/red_channel.h index 1521f417..b298127f 100644 --- a/server/red_channel.h +++ b/server/red_channel.h @@ -38,7 +38,7 @@ typedef int (*handle_message_proc)(void *opaque, SpiceDataHeader *header, uint8_t *msg); -typedef int (*handle_parsed_proc)(void *opaque, size_t size, uint32_t type, void *message); +typedef int (*handle_parsed_proc)(void *opaque, uint32_t size, uint16_t type, void *message); typedef uint8_t *(*alloc_msg_recv_buf_proc)(void *opaque, SpiceDataHeader *msg_header); typedef void (*release_msg_recv_buf_proc)(void *opaque, SpiceDataHeader *msg_header, uint8_t *msg); @@ -98,7 +98,7 @@ typedef struct RedChannel RedChannel; typedef uint8_t *(*channel_alloc_msg_recv_buf_proc)(RedChannel *channel, SpiceDataHeader *msg_header); -typedef int (*channel_handle_parsed_proc)(RedChannel *channel, size_t size, uint32_t type, +typedef int (*channel_handle_parsed_proc)(RedChannel *channel, uint32_t size, uint16_t type, void *message); typedef int (*channel_handle_message_proc)(RedChannel *channel, SpiceDataHeader *header, uint8_t *msg); -- cgit