[Spice-commits] server/dcc-encoders.c server/dcc-encoders.h server/red_worker.c spice-common

[Frediano Ziglio]

 server/dcc-encoders.c |    2 +-
 server/dcc-encoders.h |    4 ++--
 server/red_worker.c   |   12 ++++++------
 spice-common          |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 501c5ed8ca6f0d612c05a8f42f9e2a8754ec4f72
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Tue Sep 24 15:24:13 2013 +0200

    worker: simplify GlzDrawableInstanceItem fields name
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/dcc-encoders.c b/server/dcc-encoders.c
index 45db96f..9916d20 100644
--- a/server/dcc-encoders.c
+++ b/server/dcc-encoders.c
@@ -323,7 +323,7 @@ static void glz_usr_free_image(GlzEncoderUsrContext *usr, GlzUsrImageContext *im
 {
     GlzData *lz_data = (GlzData *)usr;
     GlzDrawableInstanceItem *glz_drawable_instance = (GlzDrawableInstanceItem *)image;
-    DisplayChannelClient *drawable_cc = glz_drawable_instance->red_glz_drawable->dcc;
+    DisplayChannelClient *drawable_cc = glz_drawable_instance->glz_drawable->dcc;
     DisplayChannelClient *this_cc = SPICE_CONTAINEROF(lz_data, DisplayChannelClient, glz_data);
     if (this_cc == drawable_cc) {
         dcc_free_glz_drawable_instance(drawable_cc, glz_drawable_instance);
diff --git a/server/dcc-encoders.h b/server/dcc-encoders.h
index c9e06e7..e22610f 100644
--- a/server/dcc-encoders.h
+++ b/server/dcc-encoders.h
@@ -133,8 +133,8 @@ typedef struct RedGlzDrawable RedGlzDrawable;
 struct GlzDrawableInstanceItem {
     RingItem glz_link;
     RingItem free_link;
-    GlzEncDictImageContext *glz_instance;
-    RedGlzDrawable         *red_glz_drawable;
+    GlzEncDictImageContext *context;
+    RedGlzDrawable         *glz_drawable;
 };
 
 struct RedGlzDrawable {
diff --git a/server/red_worker.c b/server/red_worker.c
index 5609b47..08048a9 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -2174,8 +2174,8 @@ static GlzDrawableInstanceItem *red_display_add_glz_drawable_instance(RedGlzDraw
     ring_item_init(&ret->free_link);
     ring_item_init(&ret->glz_link);
     ring_add(&glz_drawable->instances, &ret->glz_link);
-    ret->glz_instance = NULL;
-    ret->red_glz_drawable = glz_drawable;
+    ret->context = NULL;
+    ret->glz_drawable = glz_drawable;
 
     return ret;
 }
@@ -2193,9 +2193,9 @@ void dcc_free_glz_drawable_instance(DisplayChannelClient *dcc,
     RedGlzDrawable *glz_drawable;
 
     spice_assert(glz_drawable_instance);
-    spice_assert(glz_drawable_instance->red_glz_drawable);
+    spice_assert(glz_drawable_instance->glz_drawable);
 
-    glz_drawable = glz_drawable_instance->red_glz_drawable;
+    glz_drawable = glz_drawable_instance->glz_drawable;
 
     spice_assert(glz_drawable->dcc == dcc);
     spice_assert(glz_drawable->instances_count);
@@ -2265,7 +2265,7 @@ static void dcc_free_glz_drawable(DisplayChannelClient *dcc, RedGlzDrawable *dra
         if (!ring_item_is_linked(&instance->free_link)) {
             // the instance didn't get out from window yet
             glz_enc_dictionary_remove_image(dcc->glz_dict->dict,
-                                            instance->glz_instance,
+                                            instance->context,
                                             &dcc->glz_data.usr);
         }
         dcc_free_glz_drawable_instance(dcc, instance);
@@ -2377,7 +2377,7 @@ static inline int red_glz_compress_image(DisplayChannelClient *dcc,
                           src->stride, glz_data->data.bufs_head->buf.bytes,
                           sizeof(glz_data->data.bufs_head->buf),
                           glz_drawable_instance,
-                          &glz_drawable_instance->glz_instance);
+                          &glz_drawable_instance->context);
 
     stat_compress_add(&display_channel->glz_stat, start_time, src->stride * src->y, glz_size);
 
diff --git a/spice-common b/spice-common
index f471022..ac34b29 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit f471022453c20e7fcfb54b865d5fbfbcf71fa6c2
+Subproject commit ac34b294c1a5367b061be3366a5eabd9b9377872