From dc7ef0eaa225289ed13472bba0f6ffe5172bf164 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Fri, 16 Jan 2015 15:10:06 -0600 Subject: [PATCH] reds_num_of_channels() -> reds_get_n_channels() More consistent with glib naming conventions. Acked-by: Pavel Grunt --- 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 a30ba1ed..9f8a8616 100644 --- a/server/main-channel.c +++ b/server/main-channel.c @@ -348,7 +348,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_get_n_channels(reds) * sizeof(SpiceChannelId)); 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 09bc766c..0c39c052 100644 --- a/server/reds.c +++ b/server/reds.c @@ -891,7 +891,7 @@ void reds_handle_agent_mouse_event(RedsState *reds, const VDAgentMouseState *mou spice_char_device_write_buffer_add(reds->agent_state.base, char_dev_buf); } -int reds_num_of_channels(RedsState *reds) +int reds_get_n_channels(RedsState *reds) { return reds ? reds->num_of_channels : 0; } diff --git a/server/reds.h b/server/reds.h index 9d6d057d..99fd97f5 100644 --- a/server/reds.h +++ b/server/reds.h @@ -87,7 +87,7 @@ void reds_client_disconnect(RedsState *reds, RedClient *client); typedef struct MainMigrateData MainMigrateData; void reds_marshall_migrate_data(SpiceMarshaller *m); void reds_fill_channels(RedsState *reds, SpiceMsgChannels *channels_info); -int reds_num_of_channels(RedsState *reds); +int reds_get_n_channels(RedsState *reds); int reds_num_of_clients(RedsState *reds); #ifdef RED_STATISTICS void reds_update_stat_value(uint32_t value);