[spice-gtk,1/2] channel-usbredir: Rename spice_usbredir_write_callback

Submitted by Frediano Ziglio on Sept. 5, 2019, 10:02 a.m.

Details

Message ID 20190905100245.2244-1-fziglio@redhat.com
State Accepted
Commit d9ec1ce3b307d1a3e5cce7e11973f33cf99c1bd4
Headers show
Series "Series without cover letter" ( rev: 1 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio Sept. 5, 2019, 10:02 a.m.
Remove "_callback" suffix.
The function is called directly, no much reasons to keep that
suffix.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 src/channel-usbredir-priv.h | 2 +-
 src/channel-usbredir.c      | 2 +-
 src/usb-backend.c           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/channel-usbredir-priv.h b/src/channel-usbredir-priv.h
index a36f5d9b..1230628c 100644
--- a/src/channel-usbredir-priv.h
+++ b/src/channel-usbredir-priv.h
@@ -70,7 +70,7 @@  void spice_usbredir_channel_get_guest_filter(
                           int                                *rules_count_ret);
 
 /* Callback for USB backend */
-int spice_usbredir_write_callback(SpiceUsbredirChannel *channel, uint8_t *data, int count);
+int spice_usbredir_write(SpiceUsbredirChannel *channel, uint8_t *data, int count);
 
 G_END_DECLS
 
diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
index 8d4cd664..0a711c25 100644
--- a/src/channel-usbredir.c
+++ b/src/channel-usbredir.c
@@ -572,7 +572,7 @@  static int try_write_compress_LZ4(SpiceUsbredirChannel *channel, uint8_t *data,
 #endif
 
 G_GNUC_INTERNAL
-int spice_usbredir_write_callback(SpiceUsbredirChannel *channel, uint8_t *data, int count)
+int spice_usbredir_write(SpiceUsbredirChannel *channel, uint8_t *data, int count)
 {
     SpiceMsgOut *msg_out;
 
diff --git a/src/usb-backend.c b/src/usb-backend.c
index cfd14e2c..dbc96194 100644
--- a/src/usb-backend.c
+++ b/src/usb-backend.c
@@ -614,7 +614,7 @@  static int usbredir_write_callback(void *user_data, uint8_t *data, int count)
     SpiceUsbBackendChannel *ch = user_data;
     int res;
     SPICE_DEBUG("%s ch %p, %d bytes", __FUNCTION__, ch, count);
-    res = spice_usbredir_write_callback(ch->user_data, data, count);
+    res = spice_usbredir_write(ch->user_data, data, count);
     return res;
 }
 

Comments