[Spice-commits] 2 commits - server/red-client.c

[Frediano Ziglio]

 server/red-client.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 5acda5a35d571bb3107d3b138710624175928cb0
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Sat Aug 19 14:06:36 2017 +0100

    red-client: Do not compute channel if client is not connected
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Uri Lublin <uril at redhat.com>

diff --git a/server/red-client.c b/server/red-client.c
index 1dc082b4..b783b84c 100644
--- a/server/red-client.c
+++ b/server/red-client.c
@@ -185,8 +185,8 @@ void red_client_migrate(RedClient *client)
                       client->thread_id, pthread_self());
     }
     FOREACH_CHANNEL_CLIENT(client, iter, rcc) {
-        channel = red_channel_client_get_channel(rcc);
         if (red_channel_client_is_connected(rcc)) {
+            channel = red_channel_client_get_channel(rcc);
             red_channel_migrate_client(channel, rcc);
         }
     }
commit ddf38d1d1bd30c605efeb07038324b2cb5f39bbc
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Sat Aug 19 14:06:14 2017 +0100

    red-client: Minor space fixes
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Uri Lublin <uril at redhat.com>

diff --git a/server/red-client.c b/server/red-client.c
index 6dd18609..1dc082b4 100644
--- a/server/red-client.c
+++ b/server/red-client.c
@@ -139,7 +139,7 @@ red_client_class_init (RedClientClass *klass)
 }
 
 static void
-red_client_init (RedClient *self)
+red_client_init(RedClient *self)
 {
     pthread_mutex_init(&self->lock, NULL);
     self->thread_id = pthread_self();
@@ -147,10 +147,10 @@ red_client_init (RedClient *self)
 
 RedClient *red_client_new(RedsState *reds, int migrated)
 {
-  return g_object_new (RED_TYPE_CLIENT,
-                       "spice-server", reds,
-                       "migrated", migrated,
-                       NULL);
+    return g_object_new(RED_TYPE_CLIENT,
+                        "spice-server", reds,
+                        "migrated", migrated,
+                        NULL);
 }
 
 void red_client_set_migration_seamless(RedClient *client) // dest
@@ -280,11 +280,13 @@ cleanup:
     return result;
 }
 
-MainChannelClient *red_client_get_main(RedClient *client) {
+MainChannelClient *red_client_get_main(RedClient *client)
+{
     return client->mcc;
 }
 
-void red_client_set_main(RedClient *client, MainChannelClient *mcc) {
+void red_client_set_main(RedClient *client, MainChannelClient *mcc)
+{
     client->mcc = mcc;
 }