[Spice-devel] [PATCH v2 10/40] server/red_channe: make hold_item take a channel arg

Alon Levy alevy at redhat.com
Wed Mar 2 00:31:33 PST 2011


---
 server/inputs_channel.c    |    2 +-
 server/main_channel.c      |    2 +-
 server/red_channel.c       |    2 +-
 server/red_channel.h       |    2 +-
 server/red_tunnel_worker.c |    2 +-
 server/smartcard.c         |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/inputs_channel.c b/server/inputs_channel.c
index 551da27..ce532ca 100644
--- a/server/inputs_channel.c
+++ b/server/inputs_channel.c
@@ -508,7 +508,7 @@ static int inputs_channel_config_socket(RedChannel *channel)
     return TRUE;
 }
 
-static void inputs_channel_hold_pipe_item(PipeItem *item)
+static void inputs_channel_hold_pipe_item(RedChannel *channel, PipeItem *item)
 {
 }
 
diff --git a/server/main_channel.c b/server/main_channel.c
index d24c7aa..64048da 100644
--- a/server/main_channel.c
+++ b/server/main_channel.c
@@ -776,7 +776,7 @@ static int main_channel_config_socket(RedChannel *channel)
     return TRUE;
 }
 
-static void main_channel_hold_pipe_item(PipeItem *item)
+static void main_channel_hold_pipe_item(RedChannel *channel, PipeItem *item)
 {
 }
 
diff --git a/server/red_channel.c b/server/red_channel.c
index b077bcd..7bc1b68 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -465,7 +465,7 @@ void red_channel_init_send_data(RedChannel *channel, uint16_t msg_type, PipeItem
     channel->send_data.header->type = msg_type;
     channel->send_data.item = item;
     if (item) {
-        channel->hold_item(item);
+        channel->hold_item(channel, item);
     }
 }
 
diff --git a/server/red_channel.h b/server/red_channel.h
index a23a618..fb5af99 100644
--- a/server/red_channel.h
+++ b/server/red_channel.h
@@ -107,7 +107,7 @@ typedef void (*channel_release_msg_recv_buf_proc)(RedChannel *channel,
 typedef void (*channel_disconnect_proc)(RedChannel *channel);
 typedef int (*channel_configure_socket_proc)(RedChannel *channel);
 typedef void (*channel_send_pipe_item_proc)(RedChannel *channel, PipeItem *item);
-typedef void (*channel_hold_pipe_item_proc)(PipeItem *item);
+typedef void (*channel_hold_pipe_item_proc)(RedChannel *channel, PipeItem *item);
 typedef void (*channel_release_pipe_item_proc)(RedChannel *channel,
                                                PipeItem *item, int item_pushed);
 typedef void (*channel_on_incoming_error_proc)(RedChannel *channel);
diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c
index da44cfe..2e6a336 100644
--- a/server/red_tunnel_worker.c
+++ b/server/red_tunnel_worker.c
@@ -3420,7 +3420,7 @@ static void on_new_tunnel_channel(TunnelChannel *channel)
     }
 }
 
-static void tunnel_channel_hold_pipe_item(PipeItem *item)
+static void tunnel_channel_hold_pipe_item(RedChannel *channel, PipeItem *item)
 {
 }
 
diff --git a/server/smartcard.c b/server/smartcard.c
index d890372..6afa7cd 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -465,7 +465,7 @@ static int smartcard_channel_handle_message(RedChannel *channel, SpiceDataHeader
     return TRUE;
 }
 
-static void smartcard_channel_hold_pipe_item(PipeItem *item)
+static void smartcard_channel_hold_pipe_item(RedChannel *channel, PipeItem *item)
 {
 }
 
-- 
1.7.4.1



More information about the Spice-devel mailing list