[Spice-devel] [PATCH 15/23] inline dcc_release_item

[Jonathon Jongsma]

If you change the summary to *REMOVE* dcc_release_item

Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

On Mon, 2016-05-16 at 14:31 +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/dcc-send.c        | 2 +-
>  server/dcc.c             | 5 -----
>  server/dcc.h             | 3 ---
>  server/display-channel.c | 5 +----
>  4 files changed, 2 insertions(+), 13 deletions(-)
> 
> diff --git a/server/dcc-send.c b/server/dcc-send.c
> index 0f645a9..f0f2e16 100644
> --- a/server/dcc-send.c
> +++ b/server/dcc-send.c
> @@ -2455,7 +2455,7 @@ void dcc_send_item(DisplayChannelClient *dcc,
> RedPipeItem *pipe_item)
>          spice_warn_if_reached();
>      }
>  
> -    dcc_release_item(dcc, pipe_item, FALSE);
> +    red_pipe_item_unref(pipe_item);
>  
>      // a message is pending
>      if (red_channel_client_send_message_pending(rcc)) {
> diff --git a/server/dcc.c b/server/dcc.c
> index 7d9d366..b9e4eb3 100644
> --- a/server/dcc.c
> +++ b/server/dcc.c
> @@ -1607,8 +1607,3 @@ int dcc_handle_migrate_data(DisplayChannelClient *dcc,
> uint32_t size, void *mess
>      red_channel_client_ack_zero_messages_window(RED_CHANNEL_CLIENT(dcc));
>      return TRUE;
>  }
> -
> -void dcc_release_item(DisplayChannelClient *dcc, RedPipeItem *item, int
> item_pushed)
> -{
> -    red_pipe_item_unref(item);
> -}
> diff --git a/server/dcc.h b/server/dcc.h
> index 63a7496..864a768 100644
> --- a/server/dcc.h
> +++ b/server/dcc.h
> @@ -203,9 +203,6 @@ void                       dcc_append_drawable            
>            (DisplayCha
>  void                       dcc_add_drawable_after                   
>  (DisplayChannelClient *dcc,
>                                                                       
>  Drawable *drawable,
>                                                                       
>  RedPipeItem *pos);
> -void                       dcc_release_item                         
>  (DisplayChannelClient *dcc,
> -                                                                     
>  RedPipeItem *item,
> -                                                                      int
> item_pushed);
>  void                       dcc_send_item                            
>  (DisplayChannelClient *dcc,
>                                                                       
>  RedPipeItem *item);
>  int                        dcc_clear_surface_drawables_from_pipe    
>  (DisplayChannelClient *dcc,
> diff --git a/server/display-channel.c b/server/display-channel.c
> index 1f4d66f..b559a4e 100644
> --- a/server/display-channel.c
> +++ b/server/display-channel.c
> @@ -1981,10 +1981,7 @@ static void hold_item(RedChannelClient *rcc,
> RedPipeItem *item)
>  
>  static void release_item(RedChannelClient *rcc, RedPipeItem *item, int
> item_pushed)
>  {
> -    DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
> -
> -    spice_return_if_fail(item != NULL);
> -    dcc_release_item(dcc, item, item_pushed);
> +    red_pipe_item_unref(item);
>  }
>  
>  static int handle_migrate_flush_mark(RedChannelClient *rcc)