[Spice-commits] 2 commits - server/display-channel.h server/red_worker.c

[Frediano Ziglio]

 server/display-channel.h |    4 ++--
 server/red_worker.c      |   18 ------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 39e1cbe3211b06bca6e5d906ffb4d0582440c5cc
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Wed Nov 18 14:22:27 2015 +0100

    worker: Remove unused red_show_tree
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/red_worker.c b/server/red_worker.c
index 1af3547..f162943 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -7158,24 +7158,6 @@ static inline void red_push(RedWorker *worker)
     }
 }
 
-void red_show_tree(RedWorker *worker)
-{
-    int x;
-
-    for (x = 0; x < NUM_SURFACES; ++x) {
-        if (!worker->surfaces[x].context.canvas)
-            continue;
-
-        RingItem *it;
-        Ring *ring = &worker->surfaces[x].current;
-        RING_FOREACH(it, ring) {
-            TreeItem *now = SPICE_CONTAINEROF(it, TreeItem, siblings_link);
-            tree_item_dump(now);
-        }
-
-    }
-}
-
 static void display_channel_client_on_disconnect(RedChannelClient *rcc)
 {
     DisplayChannel *display;
commit c66c9e6669b4f8b2f97f01df7130ff99cc2213ab
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Wed Nov 18 14:22:26 2015 +0100

    display-channel: Keep macro definition in one line
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/display-channel.h b/server/display-channel.h
index 29df313..cd26478 100644
--- a/server/display-channel.h
+++ b/server/display-channel.h
@@ -211,8 +211,8 @@ struct DisplayChannelClient {
 
 #define DCC_TO_WORKER(dcc)                                              \
     (SPICE_CONTAINEROF((dcc)->common.base.channel, CommonChannel, base)->worker)
-#define DCC_TO_DC(dcc) SPICE_CONTAINEROF((dcc)->common.base.channel,    \
-                                         DisplayChannel, common.base)
+#define DCC_TO_DC(dcc)                                                  \
+     SPICE_CONTAINEROF((dcc)->common.base.channel, DisplayChannel, common.base)
 #define RCC_TO_DCC(rcc) SPICE_CONTAINEROF((rcc), DisplayChannelClient, common.base)