From 851696a6455af827439b65f5668c9d755d9aa331 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Thu, 23 May 2019 03:54:28 +0100 Subject: [PATCH] red-channel-client: Preparation, rename send_item to avoid clash We will use this name for a virtual function from RedChannel. Signed-off-by: Frediano Ziglio --- server/red-channel-client.cpp | 4 ++-- server/red-channel-client.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/red-channel-client.cpp b/server/red-channel-client.cpp index 0916e4d1..0a52a0ec 100644 --- a/server/red-channel-client.cpp +++ b/server/red-channel-client.cpp @@ -496,7 +496,7 @@ void RedChannelClient::send_empty_msg(RedPipeItem *base) begin_send_message(); } -void RedChannelClient::send_item(RedPipeItem *item) +void RedChannelClient::send_any_item(RedPipeItem *item) { spice_assert(no_item_being_sent()); priv->reset_send_data(); @@ -1173,7 +1173,7 @@ void RedChannelClient::push() } while ((pipe_item = priv->pipe_item_get())) { - send_item(pipe_item); + send_any_item(pipe_item); } /* prepare_pipe_add() will reenable WRITE events when the priv->pipe is empty * ack_zero_messages_window() will reenable WRITE events diff --git a/server/red-channel-client.h b/server/red-channel-client.h index 7c160221..a864645a 100644 --- a/server/red-channel-client.h +++ b/server/red-channel-client.h @@ -161,7 +161,7 @@ public: /* Private functions */ private: - void send_item(RedPipeItem *item); + void send_any_item(RedPipeItem *item); void handle_outgoing(); void handle_incoming(); void handle_migrate_flush_mark();