[Spice-devel] [PATCH v2 09/10] Rename RCC_TO_DCC() to DISPLAY_CHANNEL_CLIENT()

[Frediano Ziglio]

> 
> Prepare for port to GObject
> ---
> Changes in v2:
>  - none
> 
>  server/dcc-send.c        | 86
>  ++++++++++++++++++++++++------------------------
>  server/dcc.c             |  6 ++--
>  server/dcc.h             |  2 +-
>  server/display-channel.c |  4 +--
>  4 files changed, 49 insertions(+), 49 deletions(-)
> 
> diff --git a/server/dcc-send.c b/server/dcc-send.c
> index aabe262..521e6a2 100644
> --- a/server/dcc-send.c
> +++ b/server/dcc-send.c
> @@ -133,7 +133,7 @@ static int is_surface_area_lossy(DisplayChannelClient
> *dcc, uint32_t surface_id,
>  static int is_bitmap_lossy(RedChannelClient *rcc, SpiceImage *image,
>  SpiceRect *area,
>                             Drawable *drawable, BitmapData *out_data)
>  {
> -    DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
> +    DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
>  
>      if (image == NULL) {
>          // self bitmap
> @@ -196,7 +196,7 @@ static void
> red_display_add_image_to_pixmap_cache(RedChannelClient *rcc,
>                                                    SpiceImage *image,
>                                                    SpiceImage *io_image,
>                                                    int is_lossy)
>  {
> -    DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
> +    DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
>      DisplayChannel *display_channel = DCC_TO_DC(dcc);
>  
>      if ((image->descriptor.flags & SPICE_IMAGE_FLAGS_CACHE_ME)) {
> @@ -241,7 +241,7 @@ static void
> marshal_sub_msg_inval_list_wait(SpiceMarshaller *m,
>  /* use legacy SpiceDataHeader (with sub_list) */
>  static void send_free_list_legacy(RedChannelClient *rcc)
>  {
> -    DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
> +    DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
>      FreeList *free_list = &dcc->priv->send_data.free_list;
>      SpiceMarshaller *marshaller;
>      int sub_list_len = 1;
> @@ -272,7 +272,7 @@ static void send_free_list_legacy(RedChannelClient *rcc)
>  /* use mini header and SPICE_MSG_LIST */
>  static void send_free_list(RedChannelClient *rcc)
>  {
> -    DisplayChannelClient *dcc = RCC_TO_DCC(rcc);
> +    DisplayChannelClient *dcc = DISPLAY_CHANNEL_CLIENT(rcc);
....

Acked-by: Frediano Ziglio <fziglio at redhat.com

Frediano