summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2013-09-25 21:28:45 +0200
committerFrediano Ziglio <fziglio@redhat.com>2015-11-24 13:21:39 +0000
commit58e14915d8600a2fe1e6a7770e50a388d195db2f (patch)
tree3e5f9d6f11fee9e5268d36246d646a7c41db1e2f
parent2efb507adb66343ef47ecb7b6c53b82ced331e65 (diff)
downloadspice-58e14915d8600a2fe1e6a7770e50a388d195db2f.zip
spice-58e14915d8600a2fe1e6a7770e50a388d195db2f.tar.gz
spice-58e14915d8600a2fe1e6a7770e50a388d195db2f.tar.xz
worker: rename red_connect_cursor and tidy up a bit
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com> Signed-off-by: Frediano Ziglio <fziglio@redhat.com> Acked-by: Pavel Grunt <pgrunt@redhat.com>
-rw-r--r--server/red_worker.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index e0eebce..ba32ca8 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -4359,17 +4359,16 @@ static void handle_new_display_channel(RedWorker *worker, RedClient *client, Red
dcc_start(dcc);
}
-static void red_connect_cursor(RedWorker *worker, RedClient *client, RedsStream *stream,
- int migrate,
- uint32_t *common_caps, int num_common_caps,
- uint32_t *caps, int num_caps)
+static void cursor_connect(RedWorker *worker, RedClient *client, RedsStream *stream,
+ int migrate,
+ uint32_t *common_caps, int num_common_caps,
+ uint32_t *caps, int num_caps)
{
- CursorChannel *channel;
+ CursorChannel *channel = worker->cursor_channel;
CursorChannelClient *ccc;
- spice_return_if_fail(worker->cursor_channel != NULL);
+ spice_return_if_fail(channel != NULL);
- channel = worker->cursor_channel;
spice_info("add cursor channel client");
ccc = cursor_channel_client_new(channel, client, stream,
migrate,
@@ -4897,14 +4896,12 @@ static void handle_dev_cursor_connect(void *opaque, void *payload)
{
RedWorkerMessageCursorConnect *msg = payload;
RedWorker *worker = opaque;
- RedsStream *stream = msg->stream;
- RedClient *client = msg->client;
- int migration = msg->migration;
spice_info("cursor connect");
- red_connect_cursor(worker, client, stream, migration,
- msg->common_caps, msg->num_common_caps,
- msg->caps, msg->num_caps);
+ cursor_connect(worker,
+ msg->client, msg->stream, msg->migration,
+ msg->common_caps, msg->num_common_caps,
+ msg->caps, msg->num_caps);
free(msg->caps);
free(msg->common_caps);
}