diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 15:10:06 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
| commit | 9f21f06dbd8eadae7951e0f4b31d19fe9e63ce7a (patch) | |
| tree | 1399a4b421dd486a494104d8ae4ae11445f6e417 | |
| parent | ddc34a91dbe6893661e7d293a24b3c99bd4b2024 (diff) | |
| download | spice-9f21f06dbd8eadae7951e0f4b31d19fe9e63ce7a.tar.gz spice-9f21f06dbd8eadae7951e0f4b31d19fe9e63ce7a.tar.xz spice-9f21f06dbd8eadae7951e0f4b31d19fe9e63ce7a.zip | |
reds_num_of_channels() -> reds_get_n_channels()
More consistent with glib naming conventions.
| -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 fe2a273f..defe8c05 100644 --- a/server/main-channel.c +++ b/server/main-channel.c @@ -353,7 +353,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(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 09decbfb..43e87ee3 100644 --- a/server/reds.c +++ b/server/reds.c @@ -836,7 +836,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 a1cefba9..e0c4f20c 100644 --- a/server/reds.h +++ b/server/reds.h @@ -89,7 +89,7 @@ void reds_client_disconnect(RedsState *reds, RedClient *client); typedef struct MainMigrateData MainMigrateData; void reds_marshall_migrate_data(SpiceMarshaller *m); void reds_fill_channels(SpiceMsgChannels *channels_info); -int reds_num_of_channels(RedsState *reds); +int reds_get_n_channels(RedsState *reds); int reds_num_of_clients(void); #ifdef RED_STATISTICS void reds_update_stat_value(uint32_t value); |