[Spice-devel] [PATCH 09/18] worker: simplify GlzDrawableInstanceItem fields name

[Frediano Ziglio]

From: Marc-André Lureau <marcandre.lureau at gmail.com>

---
 server/dcc-encoders.c | 2 +-
 server/dcc-encoders.h | 4 ++--
 server/dcc.c          | 6 +++---
 server/red_worker.c   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/dcc-encoders.c b/server/dcc-encoders.c
index 0a0997a..90d0ce0 100644
--- a/server/dcc-encoders.c
+++ b/server/dcc-encoders.c
@@ -322,7 +322,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 1d40252..c973502 100644
--- a/server/dcc-encoders.h
+++ b/server/dcc-encoders.h
@@ -134,8 +134,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/dcc.c b/server/dcc.c
index bfc8fd3..7ba4c9f 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -351,8 +351,8 @@ static GlzDrawableInstanceItem *add_glz_drawable_instance(RedGlzDrawable *glz_dr
     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;
 }
@@ -394,7 +394,7 @@ int dcc_compress_image_glz(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/server/red_worker.c b/server/red_worker.c
index 51352a8..9231ab5 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -2019,9 +2019,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);
@@ -2091,7 +2091,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);
-- 
2.4.3