diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 15:16:09 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
| commit | 489fc1a327bc9520e9dc75dcaab6415c5859d1ac (patch) | |
| tree | c784dd76e52c60f55027d230e2277ae7fa34559b | |
| parent | d9bd35aeaca74c6eebb6af0030c890e0be9fb6fa (diff) | |
| download | spice-489fc1a327bc9520e9dc75dcaab6415c5859d1ac.tar.gz spice-489fc1a327bc9520e9dc75dcaab6415c5859d1ac.tar.xz spice-489fc1a327bc9520e9dc75dcaab6415c5859d1ac.zip | |
Change reds_fill_channels() to take a RedsState arg
| -rw-r--r-- | server/main-channel.c | 2 | ||||
| -rw-r--r-- | server/reds.c | 2 | ||||
| -rw-r--r-- | server/reds.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/server/main-channel.c b/server/main-channel.c index defe8c05..f1d461db 100644 --- a/server/main-channel.c +++ b/server/main-channel.c @@ -354,7 +354,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_get_n_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 90a38073..53913ac0 100644 --- a/server/reds.c +++ b/server/reds.c @@ -867,7 +867,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 203b602c..2fe54deb 100644 --- a/server/reds.h +++ b/server/reds.h @@ -88,7 +88,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_get_n_channels(RedsState *reds); #ifdef RED_STATISTICS void reds_update_stat_value(uint32_t value); |