[Spice-devel] [PATCH 14/23] server/red_channe: make hold_item take a channel arg

[Marc-André Lureau]

ack

On Fri, Feb 11, 2011 at 6:23 PM, Alon Levy <alevy at redhat.com> wrote:
> ---
>  server/inputs_channel.c |    2 +-
>  server/main_channel.c   |    2 +-
>  server/red_channel.c    |    2 +-
>  server/red_channel.h    |    2 +-
>  server/smartcard.c      |    2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/server/inputs_channel.c b/server/inputs_channel.c
> index c930d4d..8b4a0ed 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 67ac72f..ccc5c5d 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 6008876..40cd208 100644
> --- a/server/red_channel.c
> +++ b/server/red_channel.c
> @@ -462,7 +462,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 2ee6566..d7d8fa3 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/smartcard.c b/server/smartcard.c
> index a93e59d..6cb90d5 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
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>



-- 
Marc-André Lureau