[Spice-commits] 3 commits - server/dcc-send.c server/red-channel.h server/red-qxl.c

[Frediano Ziglio]

 server/dcc-send.c    |    8 ++++----
 server/red-channel.h |    2 +-
 server/red-qxl.c     |    6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 3ae8ce38a10a966462168d532b2b551f0eaea545
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Mar 14 18:10:33 2016 +0100

    Use more explicit variable name in marshall_gl_scanout()
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/dcc-send.c b/server/dcc-send.c
index 16c5098..53e02f5 100644
--- a/server/dcc-send.c
+++ b/server/dcc-send.c
@@ -2307,12 +2307,12 @@ static void marshall_gl_scanout(RedChannelClient *rcc,
     DisplayChannel *display_channel = DCC_TO_DC(dcc);
     QXLInstance* qxl = display_channel->common.qxl;
 
-    SpiceMsgDisplayGlScanoutUnix *so = red_qxl_get_gl_scanout(qxl->st);
-    if (so != NULL) {
+    SpiceMsgDisplayGlScanoutUnix *scanout = red_qxl_get_gl_scanout(qxl->st);
+    if (scanout != NULL) {
         red_channel_client_init_send_data(rcc, SPICE_MSG_DISPLAY_GL_SCANOUT_UNIX, NULL);
-        spice_marshall_msg_display_gl_scanout_unix(m, so);
+        spice_marshall_msg_display_gl_scanout_unix(m, scanout);
     }
-    red_qxl_put_gl_scanout(qxl->st, so);
+    red_qxl_put_gl_scanout(qxl->st, scanout);
 }
 
 static void marshall_gl_draw(RedChannelClient *rcc,
commit a33f8742497f0bc35fdc4229033af37a401333b4
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Mar 14 18:10:30 2016 +0100

    Fix typo in variable name in function prototype
    
    num_common_cap rather than num_common_caps was not consistent with
    the naming of the other arguments.
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/red-channel.h b/server/red-channel.h
index 7c1c95d..0934f29 100644
--- a/server/red-channel.h
+++ b/server/red-channel.h
@@ -184,7 +184,7 @@ typedef uint64_t (*channel_handle_migrate_data_get_serial_proc)(RedChannelClient
 
 
 typedef void (*channel_client_connect_proc)(RedChannel *channel, RedClient *client, RedsStream *stream,
-                                            int migration, int num_common_cap, uint32_t *common_caps,
+                                            int migration, int num_common_caps, uint32_t *common_caps,
                                             int num_caps, uint32_t *caps);
 typedef void (*channel_client_disconnect_proc)(RedChannelClient *base);
 typedef void (*channel_client_migrate_proc)(RedChannelClient *base);
commit aa877006824a289b29bec94c9de63813da4fa122
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Mar 14 18:10:29 2016 +0100

    Remove unused red_qxl_set_dispatcher_opaque
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/red-qxl.c b/server/red-qxl.c
index 491046f..3a94944 100644
--- a/server/red-qxl.c
+++ b/server/red-qxl.c
@@ -1008,12 +1008,6 @@ struct Dispatcher *red_qxl_get_dispatcher(QXLState *qxl_state)
     return &qxl_state->dispatcher;
 }
 
-void red_qxl_set_dispatcher_opaque(QXLState *qxl_state,
-                                   void *opaque)
-{
-    dispatcher_set_opaque(&qxl_state->dispatcher, opaque);
-}
-
 void red_qxl_clear_pending(QXLState *qxl_state, int pending)
 {
     spice_return_if_fail(qxl_state != NULL);