From: Jonathon Jongsma <jjong...@redhat.com>
---
server/main-channel.c | 2 +-
server/reds.c | 2 +-
server/reds.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/main-channel.c b/server/main-channel.c
index 1b774f3..b5268fb 100644
--- a/server/main-channel.c
+++ b/server/main-channel.c
@@ -349,7 +349,7 @@ static void main_channel_marshall_channels(RedChannelClient
*rcc,
red_channel_client_init_send_data(rcc, SPICE_MSG_MAIN_CHANNELS_LIST, item);
channels_info = (SpiceMsgChannels *)spice_malloc(sizeof(SpiceMsgChannels)
+ reds_num_of_channels(reds) *
sizeof(SpiceChannelId));
- reds_fill_channels(channels_info);
+ reds_fill_channels(reds, channels_info);
spice_marshall_msg_main_channels_list(m, channels_info);
free(channels_info);
}
diff --git a/server/reds.c b/server/reds.c
index 0169fac..bd905e2 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -922,7 +922,7 @@ static int channel_is_secondary(RedChannel *channel)
return FALSE;
}
-void reds_fill_channels(SpiceMsgChannels *channels_info)
+void reds_fill_channels(RedsState *reds, SpiceMsgChannels *channels_info)
{
RingItem *now;
int used_channels = 0;
diff --git a/server/reds.h b/server/reds.h
index aaa9477..fbb616d 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -86,7 +86,7 @@ void reds_client_disconnect(RedsState *reds, RedClient
*client);
// Temporary (?) for splitting main channel
typedef struct MainMigrateData MainMigrateData;
void reds_marshall_migrate_data(SpiceMarshaller *m);
-void reds_fill_channels(SpiceMsgChannels *channels_info);
+void reds_fill_channels(RedsState *reds, SpiceMsgChannels *channels_info);
int reds_num_of_channels(RedsState *reds);
#ifdef RED_STATISTICS
void reds_update_stat_value(uint32_t value);
--
2.4.3
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
