[Spice-commits] 2 commits - server/char-device.h server/spicevmc.c

[GitLab Mirror]

 server/char-device.h |    6 +++---
 server/spicevmc.c    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a84d9c653efde2a963cb80c337be6dc5e81cff26
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Sat Jun 1 13:14:11 2019 +0100

    spicevmc: Reuse "sin" variable
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/server/spicevmc.c b/server/spicevmc.c
index 460edb04..84bbb73c 100644
--- a/server/spicevmc.c
+++ b/server/spicevmc.c
@@ -786,7 +786,7 @@ static void spicevmc_connect(RedChannel *channel, RedClient *client,
         return;
     }
 
-    sif = spice_char_device_get_interface(vmc_channel->chardev_sin);
+    sif = spice_char_device_get_interface(sin);
     if (sif->state) {
         sif->state(sin, 1);
     }
commit a9af580a6e77026a53252366ebdc25d9dc5b0f11
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Sun Jun 2 14:42:38 2019 +0300

    char-device: Fix some comments
    
    Some function names where changed.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/server/char-device.h b/server/char-device.h
index 893d3e4b..32ee4f78 100644
--- a/server/char-device.h
+++ b/server/char-device.h
@@ -93,13 +93,13 @@ GType red_char_device_get_type(void) G_GNUC_CONST;
  * device attached: create new object instantiating a RedCharDevice child class
  * device detached: call red_char_device_destroy/reset
  *
- * client connected and associated with a device: red_char_device__add
- * client disconnected: red_char_device__remove
+ * client connected and associated with a device: red_char_device_client_add
+ * client disconnected: red_char_device_client_remove
  *
  * Writing to the device
  * ---------------------
  * Write the data into RedCharDeviceWriteBuffer:
- * call red_char_device_write_buffer_get/red_char_device_write_buffer_get_server_no_token
+ * call red_char_device_write_buffer_get_client/red_char_device_write_buffer_get_server
  * in order to get an appropriate buffer.
  * call red_char_device_write_buffer_add in order to push the buffer to the write queue.
  * If you choose not to push the buffer to the device, call