summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2015-01-16 14:23:22 -0600
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-02-23 23:00:42 +0100
commit6b712c31f363afb6e4136283b6f8a9d942a92e04 (patch)
tree322208069ba4d35b541d317cfa618424509b5ad2
parent6a8775f360af90bf4f44e243d0a4a2b24f0a008d (diff)
downloadspice-6b712c31f363afb6e4136283b6f8a9d942a92e04.tar.gz
spice-6b712c31f363afb6e4136283b6f8a9d942a92e04.tar.xz
spice-6b712c31f363afb6e4136283b6f8a9d942a92e04.zip
Change reds_unregister_channel() to take RedsState arg
-rw-r--r--server/reds.c2
-rw-r--r--server/reds.h2
-rw-r--r--server/sound.c2
-rw-r--r--server/spicevmc.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/server/reds.c b/server/reds.c
index 951c0a2b..92475d3b 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -328,7 +328,7 @@ void reds_register_channel(RedsState *reds, RedChannel *channel)
reds->num_of_channels++;
}
-void reds_unregister_channel(RedChannel *channel)
+void reds_unregister_channel(RedsState *reds, RedChannel *channel)
{
if (ring_item_is_linked(&channel->link)) {
ring_remove(&channel->link);
diff --git a/server/reds.h b/server/reds.h
index b194dab2..bedd7424 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -58,7 +58,7 @@ uint32_t reds_get_mm_time(void);
void reds_set_client_mouse_allowed(int is_client_mouse_allowed,
int x_res, int y_res);
void reds_register_channel(RedsState *reds, RedChannel *channel);
-void reds_unregister_channel(RedChannel *channel);
+void reds_unregister_channel(RedsState *reds, RedChannel *channel);
int reds_get_mouse_mode(void); // used by inputs_channel
int reds_get_agent_mouse(void); // used by inputs_channel
int reds_has_vdagent(void); // used by inputs channel
diff --git a/server/sound.c b/server/sound.c
index f03c36df..0dadbd83 100644
--- a/server/sound.c
+++ b/server/sound.c
@@ -1570,7 +1570,7 @@ static void snd_detach_common(SndWorker *worker)
}
remove_worker(worker);
snd_disconnect_channel(worker->connection);
- reds_unregister_channel(worker->base_channel);
+ reds_unregister_channel(reds, worker->base_channel);
red_channel_destroy(worker->base_channel);
}
diff --git a/server/spicevmc.c b/server/spicevmc.c
index c38c9749..3ebd1ac0 100644
--- a/server/spicevmc.c
+++ b/server/spicevmc.c
@@ -560,7 +560,7 @@ void spicevmc_device_disconnect(SpiceCharDeviceInstance *sin)
spice_char_device_state_destroy(sin->st);
state->chardev_st = NULL;
- reds_unregister_channel(&state->channel);
+ reds_unregister_channel(reds, &state->channel);
free(state->pipe_item);
red_channel_destroy(&state->channel);
}