[librsvg: 11/25] RsvgVpathDash: Rename internal fields to what we will refactor

[Federico Mena Quintero <federico src gnome org>]

commit 2cf4d4de5644f37cee5fc53013b655b703c591b3
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Jan 29 18:19:51 2018 -0600

    RsvgVpathDash: Rename internal fields to what we will refactor
    
    The new names will be those from the Rustified version

 rsvg-cairo-draw.c |  2 +-
 rsvg-styles.c     | 54 +++++++++++++++++++++++++++---------------------------
 rsvg-styles.h     |  4 ++--
 3 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
index 8f2a79b..83109f4 100644
--- a/rsvg-cairo-draw.c
+++ b/rsvg-cairo-draw.c
@@ -237,7 +237,7 @@ setup_cr_for_stroke (cairo_t *cr, RsvgDrawingCtx *ctx, RsvgState *state)
     cairo_set_miter_limit (cr, state->miter_limit);
     cairo_set_line_cap (cr, (cairo_line_cap_t) state->cap);
     cairo_set_line_join (cr, (cairo_line_join_t) state->join);
-    cairo_set_dash (cr, state->dash.dash, state->dash.n_dash,
+    cairo_set_dash (cr, state->dash.dashes, state->dash.num_dashes,
                     rsvg_length_normalize (&state->dash_offset, ctx));
 }
 
diff --git a/rsvg-styles.c b/rsvg-styles.c
index bdd8ca3..d733fef 100644
--- a/rsvg-styles.c
+++ b/rsvg-styles.c
@@ -232,10 +232,10 @@ rsvg_state_finalize (RsvgState * state)
     rsvg_paint_server_unref (state->stroke);
     state->stroke = NULL;
 
-    if (state->dash.n_dash != 0) {
-        g_free (state->dash.dash);
-        state->dash.n_dash = 0;
-        state->dash.dash = NULL;
+    if (state->dash.num_dashes != 0) {
+        g_free (state->dash.dashes);
+        state->dash.num_dashes = 0;
+        state->dash.dashes = NULL;
     }
 
     if (state->styles) {
@@ -287,10 +287,10 @@ rsvg_state_clone (RsvgState * dst, const RsvgState * src)
 
     dst->styles = g_hash_table_ref (src->styles);
 
-    if (src->dash.n_dash > 0) {
-        dst->dash.dash = g_new0 (gdouble, src->dash.n_dash);
-        for (i = 0; i < src->dash.n_dash; i++)
-            dst->dash.dash[i] = src->dash.dash[i];
+    if (src->dash.num_dashes > 0) {
+        dst->dash.dashes = g_new0 (gdouble, src->dash.num_dashes);
+        for (i = 0; i < src->dash.num_dashes; i++)
+            dst->dash.dashes[i] = src->dash.dashes[i];
     }
 }
 
@@ -415,14 +415,14 @@ rsvg_state_inherit_run (RsvgState * dst, const RsvgState * src,
         dst->lang = g_strdup (src->lang);
     }
 
-    if (src->dash.n_dash > 0 && (function (dst->has_dash, src->has_dash))) {
+    if (src->dash.num_dashes > 0 && (function (dst->has_dash, src->has_dash))) {
         if (dst->has_dash)
-            g_free (dst->dash.dash);
+            g_free (dst->dash.dashes);
 
-        dst->dash.dash = g_new0 (gdouble, src->dash.n_dash);
-        dst->dash.n_dash = src->dash.n_dash;
-        for (i = 0; i < src->dash.n_dash; i++)
-            dst->dash.dash[i] = src->dash.dash[i];
+        dst->dash.dashes = g_new0 (gdouble, src->dash.num_dashes);
+        dst->dash.num_dashes = src->dash.num_dashes;
+        for (i = 0; i < src->dash.num_dashes; i++)
+            dst->dash.dashes[i] = src->dash.dashes[i];
     }
 
     if (function (dst->has_dashoffset, src->has_dashoffset)) {
@@ -957,11 +957,11 @@ rsvg_parse_style_pair (RsvgState * state,
     } else if (g_str_equal (name, "stroke-dasharray")) {
         state->has_dash = TRUE;
         if (g_str_equal (value, "none")) {
-            if (state->dash.n_dash != 0) {
+            if (state->dash.num_dashes != 0) {
                 /* free any cloned dash data */
-                g_free (state->dash.dash);
-                state->dash.dash = NULL;
-                state->dash.n_dash = 0;
+                g_free (state->dash.dashes);
+                state->dash.dashes = NULL;
+                state->dash.num_dashes = 0;
             }
         } else {
             gchar **dashes = g_strsplit (value, ",", -1);
@@ -974,28 +974,28 @@ rsvg_parse_style_pair (RsvgState * state,
                 for (n_dashes = 0; dashes[n_dashes] != NULL; n_dashes++);
 
                 is_even = (n_dashes % 2 == 0);
-                state->dash.n_dash = (is_even ? n_dashes : n_dashes * 2);
-                state->dash.dash = g_new0 (double, state->dash.n_dash);
+                state->dash.num_dashes = (is_even ? n_dashes : n_dashes * 2);
+                state->dash.dashes = g_new0 (double, state->dash.num_dashes);
 
                 /* TODO: handle negative value == error case */
 
                 /* the even and base case */
                 for (i = 0; i < n_dashes; i++) {
-                    state->dash.dash[i] = g_ascii_strtod (dashes[i], NULL);
-                    total += state->dash.dash[i];
+                    state->dash.dashes[i] = g_ascii_strtod (dashes[i], NULL);
+                    total += state->dash.dashes[i];
                 }
                 /* if an odd number of dashes is found, it gets repeated */
                 if (!is_even)
-                    for (; i < state->dash.n_dash; i++)
-                        state->dash.dash[i] = state->dash.dash[i - n_dashes];
+                    for (; i < state->dash.num_dashes; i++)
+                        state->dash.dashes[i] = state->dash.dashes[i - n_dashes];
 
                 g_strfreev (dashes);
                 /* If the dashes add up to 0, then it should 
                    be ignored */
                 if (total == 0) {
-                    g_free (state->dash.dash);
-                    state->dash.dash = NULL;
-                    state->dash.n_dash = 0;
+                    g_free (state->dash.dashes);
+                    state->dash.dashes = NULL;
+                    state->dash.num_dashes = 0;
                 }
             }
         }
diff --git a/rsvg-styles.h b/rsvg-styles.h
index d22f66d..9089166 100644
--- a/rsvg-styles.h
+++ b/rsvg-styles.h
@@ -64,8 +64,8 @@ typedef enum {
 typedef struct _RsvgVpathDash RsvgVpathDash;
 
 struct _RsvgVpathDash {
-    int n_dash;
-    double *dash;
+    gsize num_dashes;
+    double *dashes;
 };
 
 struct _RsvgState {