[Spice-commits] server/dcc.cpp server/dcc.h

[GitLab Mirror]

 server/dcc.cpp |   10 +++-------
 server/dcc.h   |    7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 70347f31759f05f78a41f4f788801a1a705e6add
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Sat Jun 6 08:25:49 2020 +0100

    dcc: Remove unused result from dcc_add_surface_area_image
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
    Acked-by: Julien Ropé <jrope at redhat.com>

diff --git a/server/dcc.cpp b/server/dcc.cpp
index 788deb90..3fd58535 100644
--- a/server/dcc.cpp
+++ b/server/dcc.cpp
@@ -198,11 +198,9 @@ void dcc_create_surface(DisplayChannelClient *dcc, int surface_id)
 }
 
 // adding the pipe item after pos. If pos == NULL, adding to head.
-RedImageItem *dcc_add_surface_area_image(DisplayChannelClient *dcc,
-                                         int surface_id,
-                                         SpiceRect *area,
-                                         GList *pipe_item_pos,
-                                         int can_lossy)
+void
+dcc_add_surface_area_image(DisplayChannelClient *dcc, int surface_id,
+                           SpiceRect *area, GList *pipe_item_pos, int can_lossy)
 {
     DisplayChannel *display = DCC_TO_DC(dcc);
     RedSurface *surface = &display->priv->surfaces[surface_id];
@@ -256,8 +254,6 @@ RedImageItem *dcc_add_surface_area_image(DisplayChannelClient *dcc,
     } else {
         dcc->pipe_add(&item->base);
     }
-
-    return item;
 }
 
 void dcc_push_surface_image(DisplayChannelClient *dcc, int surface_id)
diff --git a/server/dcc.h b/server/dcc.h
index 8999bf7c..3172ba1b 100644
--- a/server/dcc.h
+++ b/server/dcc.h
@@ -152,11 +152,6 @@ void                       dcc_create_surface                        (DisplayCha
                                                                       int surface_id);
 void                       dcc_push_surface_image                    (DisplayChannelClient *dcc,
                                                                       int surface_id);
-RedImageItem *             dcc_add_surface_area_image                (DisplayChannelClient *dcc,
-                                                                      int surface_id,
-                                                                      SpiceRect *area,
-                                                                      GList *pipe_item_pos,
-                                                                      int can_lossy);
 void                       dcc_palette_cache_reset                   (DisplayChannelClient *dcc);
 void                       dcc_palette_cache_palette                 (DisplayChannelClient *dcc,
                                                                       SpicePalette *palette,
@@ -185,6 +180,8 @@ int                        dcc_compress_image                        (DisplayCha
                                                                       int can_lossy,
                                                                       compress_send_data_t* o_comp_data);
 
+void dcc_add_surface_area_image(DisplayChannelClient *dcc, int surface_id,
+                                SpiceRect *area, GList *pipe_item_pos, int can_lossy);
 VideoStreamAgent *dcc_get_video_stream_agent(DisplayChannelClient *dcc, int stream_id);
 ImageEncoders *dcc_get_encoders(DisplayChannelClient *dcc);
 spice_wan_compression_t    dcc_get_jpeg_state                        (DisplayChannelClient *dcc);