[Spice-commits] server/red_worker.c

[Frediano Ziglio]

 server/red_worker.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 788c9d47907e33238350e837aadb12e5d7f608a0
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Mon Oct 26 16:41:19 2015 +0000

    worker: remove unused type field from AddBufInfo
    
    value was always BUF_TYPE_RAW
    
    Signed-off-by: Marc-André Lureau <marcandre.lureau at gmail.com>
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Uri Lublin <ulublin at redhat.com>

diff --git a/server/red_worker.c b/server/red_worker.c
index 965a14d..a55e57a 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -266,10 +266,6 @@ struct SpiceWatch {
 };
 
 enum {
-    BUF_TYPE_RAW = 1,
-};
-
-enum {
     PIPE_ITEM_TYPE_DRAW = PIPE_ITEM_TYPE_CHANNEL_BASE,
     PIPE_ITEM_TYPE_INVAL_ONE,
     PIPE_ITEM_TYPE_CURSOR,
@@ -4688,7 +4684,6 @@ static void red_push_surface_image(DisplayChannelClient *dcc, int surface_id)
 }
 
 typedef struct {
-    uint32_t type;
     void *data;
     uint32_t size;
 } AddBufInfo;
@@ -4711,11 +4706,7 @@ static void marshaller_add_compressed(SpiceMarshaller *m,
 static void add_buf_from_info(SpiceMarshaller *m, AddBufInfo *info)
 {
     if (info->data) {
-        switch (info->type) {
-        case BUF_TYPE_RAW:
-            spice_marshaller_add_ref(m, info->data, info->size);
-            break;
-        }
+        spice_marshaller_add_ref(m, info->data, info->size);
     }
 }
 
@@ -6435,7 +6426,6 @@ static void fill_cursor(CursorChannelClient *ccc, SpiceCursor *red_cursor,
     }
 
     if (red_cursor->data_size) {
-        addbuf->type = BUF_TYPE_RAW;
         addbuf->data = red_cursor->data;
         addbuf->size = red_cursor->data_size;
     }