[Spice-devel] [PATCH 17/19] display: fix generate_uid name

[Frediano Ziglio]

> 
> From: Marc-André Lureau <marcandre.lureau at gmail.com>
> 
> ---
>  server/dcc-send.c        | 2 +-
>  server/display-channel.c | 4 ++--
>  server/display-channel.h | 1 -
>  3 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/server/dcc-send.c b/server/dcc-send.c
> index 1dc9dcf..f0bbfec 100644
> --- a/server/dcc-send.c
> +++ b/server/dcc-send.c
> @@ -1919,7 +1919,7 @@ static void red_marshall_image(RedChannelClient *rcc,
> SpiceMarshaller *m, ImageI
>      spice_assert(rcc && display && item);
>      worker = display->common.worker;
>  
> -    QXL_SET_IMAGE_ID(&red_image, QXL_IMAGE_GROUP_RED,
> generate_uid(display));
> +    QXL_SET_IMAGE_ID(&red_image, QXL_IMAGE_GROUP_RED,
> display_channel_generate_uid(display));
>      red_image.descriptor.type = SPICE_IMAGE_TYPE_BITMAP;
>      red_image.descriptor.flags = item->image_flags;
>      red_image.descriptor.width = item->width;
> diff --git a/server/display-channel.c b/server/display-channel.c
> index e29d2ad..f2c3fc6 100644
> --- a/server/display-channel.c
> +++ b/server/display-channel.c
> @@ -20,7 +20,7 @@
>  
>  #include "display-channel.h"
>  
> -uint32_t generate_uid(DisplayChannel *display)
> +uint32_t display_channel_generate_uid(DisplayChannel *display)
>  {
>      spice_return_val_if_fail(display != NULL, 0);
>  
> @@ -962,7 +962,7 @@ static void handle_self_bitmap(DisplayChannel *display,
> Drawable *drawable)
>      image = spice_new0(SpiceImage, 1);
>      image->descriptor.type = SPICE_IMAGE_TYPE_BITMAP;
>      image->descriptor.flags = 0;
> -    QXL_SET_IMAGE_ID(image, QXL_IMAGE_GROUP_RED, generate_uid(display));
> +    QXL_SET_IMAGE_ID(image, QXL_IMAGE_GROUP_RED,
> display_channel_generate_uid(display));
>      image->u.bitmap.flags = surface->context.top_down ?
>      SPICE_BITMAP_FLAGS_TOP_DOWN : 0;
>      image->u.bitmap.format =
>      spice_bitmap_from_surface_type(surface->context.format);
>      image->u.bitmap.stride = dest_stride;
> diff --git a/server/display-channel.h b/server/display-channel.h
> index 28ef66c..b89f84e 100644
> --- a/server/display-channel.h
> +++ b/server/display-channel.h
> @@ -432,7 +432,6 @@ static inline void region_add_clip_rects(QRegion *rgn,
> SpiceClipRects *data)
>      }
>  }
>  
> -uint32_t generate_uid(DisplayChannel *display);
>  void detach_streams_behind(DisplayChannel *display, QRegion *region,
>  Drawable *drawable);
>  void drawable_draw(DisplayChannel *display, Drawable *item);
>  void drawables_init(DisplayChannel *display);

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

took me some time to understand the fix. The declaration for the
new function was already there

Frediano