[Spice-commits] server/dcc.c server/display-channel.c server/display-channel.h server/red-parse-qxl.c server/red-parse-qxl.h server/stream.c server/stream.h

[Frediano Ziglio]

 server/dcc.c             |    2 +-
 server/display-channel.c |    8 +++++---
 server/display-channel.h |    2 --
 server/red-parse-qxl.c   |    2 +-
 server/red-parse-qxl.h   |    1 -
 server/stream.c          |    4 ++--
 server/stream.h          |    1 -
 7 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 8782bb32115d19680c144d5a9b74f34c16d09b0d
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue May 24 10:15:51 2016 +0100

    Make some function static
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/dcc.c b/server/dcc.c
index e4af915..9013626 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -281,7 +281,7 @@ static void add_drawable_surface_images(DisplayChannelClient *dcc, Drawable *dra
     dcc_push_surface_image(dcc, drawable->surface_id);
 }
 
-void red_drawable_pipe_item_free(RedPipeItem *item)
+static void red_drawable_pipe_item_free(RedPipeItem *item)
 {
     RedDrawablePipeItem *dpi = SPICE_CONTAINEROF(item, RedDrawablePipeItem,
                                                  dpi_pipe_item);
diff --git a/server/display-channel.c b/server/display-channel.c
index 96a6f2f..b970c9b 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -21,6 +21,8 @@
 #include "display-channel.h"
 
 static void drawable_draw(DisplayChannel *display, Drawable *drawable);
+static Drawable *display_channel_drawable_try_new(DisplayChannel *display,
+                                                  int process_commands_generation);
 
 uint32_t display_channel_generate_uid(DisplayChannel *display)
 {
@@ -848,7 +850,7 @@ static bool drawable_can_stream(DisplayChannel *display, Drawable *drawable)
     return TRUE;
 }
 
-void display_channel_print_stats(DisplayChannel *display)
+static void display_channel_print_stats(DisplayChannel *display)
 {
 #ifdef RED_WORKER_STAT
     stat_time_t total = display->add_stat.total;
@@ -1331,8 +1333,8 @@ static void drawables_init(DisplayChannel *display)
  *
  * @return pointer to uninitialized Drawable or NULL on failure
  */
-Drawable *display_channel_drawable_try_new(DisplayChannel *display,
-                                           int process_commands_generation)
+static Drawable *display_channel_drawable_try_new(DisplayChannel *display,
+                                                  int process_commands_generation)
 {
     Drawable *drawable;
 
diff --git a/server/display-channel.h b/server/display-channel.h
index 647d8c0..4eb78c5 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -280,8 +280,6 @@ void                       display_channel_set_stream_video          (DisplayCha
 int                        display_channel_get_streams_timeout       (DisplayChannel *display);
 void                       display_channel_compress_stats_print      (const DisplayChannel *display);
 void                       display_channel_compress_stats_reset      (DisplayChannel *display);
-Drawable *                 display_channel_drawable_try_new          (DisplayChannel *display,
-                                                                      int process_commands_generation);
 void                       display_channel_surface_unref             (DisplayChannel *display,
                                                                       uint32_t surface_id);
 void                       display_channel_current_flush             (DisplayChannel *display,
diff --git a/server/red-parse-qxl.c b/server/red-parse-qxl.c
index d5358d3..0dafbef 100644
--- a/server/red-parse-qxl.c
+++ b/server/red-parse-qxl.c
@@ -585,7 +585,7 @@ error:
     return NULL;
 }
 
-void red_put_image(SpiceImage *red)
+static void red_put_image(SpiceImage *red)
 {
     if (red == NULL)
         return;
diff --git a/server/red-parse-qxl.h b/server/red-parse-qxl.h
index 0749b88..c92fc84 100644
--- a/server/red-parse-qxl.h
+++ b/server/red-parse-qxl.h
@@ -118,7 +118,6 @@ void red_get_rect_ptr(SpiceRect *red, const QXLRect *qxl);
 int red_get_drawable(RedMemSlotInfo *slots, int group_id,
                      RedDrawable *red, QXLPHYSICAL addr, uint32_t flags);
 void red_put_drawable(RedDrawable *red);
-void red_put_image(SpiceImage *red);
 
 int red_get_update_cmd(RedMemSlotInfo *slots, int group_id,
                        RedUpdateCmd *red, QXLPHYSICAL addr);
diff --git a/server/stream.c b/server/stream.c
index be92289..f59abeb 100644
--- a/server/stream.c
+++ b/server/stream.c
@@ -27,7 +27,7 @@
          item != NULL;                                  \
          item = ring_next(&(display)->streams, item))
 
-void stream_agent_stats_print(StreamAgent *agent)
+static void stream_agent_stats_print(StreamAgent *agent)
 {
 #ifdef STREAM_STATS
     StreamStats *stats = &agent->stats;
@@ -161,7 +161,7 @@ void stream_agent_unref(DisplayChannel *display, StreamAgent *agent)
     stream_unref(display, agent->stream);
 }
 
-void red_stream_clip_item_free(RedPipeItem *base)
+static void red_stream_clip_item_free(RedPipeItem *base)
 {
     g_return_if_fail(base != NULL);
     RedStreamClipItem *item = SPICE_CONTAINEROF(base, RedStreamClipItem, base);
diff --git a/server/stream.h b/server/stream.h
index 511d752..715f920 100644
--- a/server/stream.h
+++ b/server/stream.h
@@ -159,7 +159,6 @@ void                  stream_detach_behind                          (DisplayChan
 
 void                  stream_agent_unref                            (DisplayChannel *display,
                                                                      StreamAgent *agent);
-void                  stream_agent_stats_print                      (StreamAgent *agent);
 void                  stream_agent_stop                             (StreamAgent *agent);
 
 void detach_stream(DisplayChannel *display, Stream *stream, int detach_sized);