summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2012-08-30 10:36:54 +0300
committerAlon Levy <alevy@redhat.com>2012-08-30 17:08:09 +0300
commit3d28317e978271085ad274139f5646b2b171d509 (patch)
tree65f99139a30bc86971621045f86cb629f468e89d
parent4f7876e4c86b284db33c50888b759fbd71a630b1 (diff)
downloadspice-3d28317e978271085ad274139f5646b2b171d509.tar.gz
spice-3d28317e978271085ad274139f5646b2b171d509.tar.xz
spice-3d28317e978271085ad274139f5646b2b171d509.zip
server: freezed->froze, missing whitespace after declarations
-rw-r--r--server/red_channel.c1
-rw-r--r--server/red_worker.c7
2 files changed, 5 insertions, 3 deletions
diff --git a/server/red_channel.c b/server/red_channel.c
index c720b70c..b52f9e6e 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -734,6 +734,7 @@ int red_channel_client_waits_for_migrate_data(RedChannelClient *rcc)
int red_channel_waits_for_migrate_data(RedChannel *channel)
{
RedChannelClient *rcc;
+
if (!red_channel_is_connected(channel)) {
return FALSE;
}
diff --git a/server/red_worker.c b/server/red_worker.c
index 2fa0e3ae..61137272 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -9828,9 +9828,9 @@ static int display_channel_handle_migrate_data(RedChannelClient *rcc, uint32_t s
spice_error("bad header");
return FALSE;
}
- /* size is set to -1 in order to keep the cache freezed till the original
- * channel client that freezed the cache on the src size receive the migrate
- * data and unfreeze the cache by setting its size > 0 and by triggering
+ /* size is set to -1 in order to keep the cache frozen until the original
+ * channel client that froze the cache on the src size receives the migrate
+ * data and unfreezes the cache by setting its size > 0 and by triggering
* pixmap_cache_reset */
dcc->pixmap_cache = red_get_pixmap_cache(dcc->common.base.client,
migrate_data->pixmap_cache_id, -1);
@@ -9890,6 +9890,7 @@ static int display_channel_handle_message(RedChannelClient *rcc, uint32_t size,
void *message)
{
DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
+
switch (type) {
case SPICE_MSGC_DISPLAY_INIT:
if (!dcc->expect_init) {