[EGIT] [core/efl] master 03/03: Evas textblock: Fixed test shadow warnings.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=13664f3af1d12a516bb64cd5f4ad583547fe198d

commit 13664f3af1d12a516bb64cd5f4ad583547fe198d
Author: Tom Hacohen <t...@stosb.com>
Date:   Fri Feb 7 13:18:38 2014 +0000

    Evas textblock: Fixed test shadow warnings.
---
 src/tests/evas/evas_test_textblock.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/tests/evas/evas_test_textblock.c 
b/src/tests/evas/evas_test_textblock.c
index ac8e5cf..0af25cb 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -2599,33 +2599,33 @@ START_TEST(evas_textblock_style)
 
    /* Multi-line padding */
    {
-      Evas_Coord x[5] = {0}, y[5] = {0}, w[5] = {0}, h[5] = {0};
+      Evas_Coord x[5] = {0}, y[5] = {0}, w2[5] = {0}, h2[5] = {0};
 
-      // w, h should not change between test 1 and 2
+      // w2, h2 should not change between test 1 and 2
       // insets and x, y should increase by 2
       // line 1 in test 2 should have same geometry as in test 1 (despite 
style)
 
       evas_object_textblock_text_markup_set(tb, "Test<br/>Test");
-      evas_object_textblock_line_number_geometry_get(tb, 0, &x[0], &y[0], 
&w[0], &h[0]);
-      evas_object_textblock_line_number_geometry_get(tb, 1, &x[1], &y[1], 
&w[1], &h[1]);
+      evas_object_textblock_line_number_geometry_get(tb, 0, &x[0], &y[0], 
&w2[0], &h2[0]);
+      evas_object_textblock_line_number_geometry_get(tb, 1, &x[1], &y[1], 
&w2[1], &h2[1]);
 
       // check line 1 geometry relatively to line 0
-      fail_if((x[0] != x[1]) || ((y[0] + h[0]) != y[1]) || (w[0] != w[1]) || 
(h[0] != h[1]));
+      fail_if((x[0] != x[1]) || ((y[0] + h2[0]) != y[1]) || (w2[0] != w2[1]) 
|| (h2[0] != h2[1]));
 
       evas_object_textblock_text_markup_set(tb, 
"Test<br/><style=glow>Test</><br/>Test");
       evas_object_textblock_style_insets_get(tb, &l, &r, &t, &b);
-      evas_object_textblock_line_number_geometry_get(tb, 0, &x[2], &y[2], 
&w[2], &h[2]);
-      evas_object_textblock_line_number_geometry_get(tb, 1, &x[3], &y[3], 
&w[3], &h[3]);
-      evas_object_textblock_line_number_geometry_get(tb, 2, &x[4], &y[4], 
&w[4], &h[4]);
+      evas_object_textblock_line_number_geometry_get(tb, 0, &x[2], &y[2], 
&w2[2], &h2[2]);
+      evas_object_textblock_line_number_geometry_get(tb, 1, &x[3], &y[3], 
&w2[3], &h2[3]);
+      evas_object_textblock_line_number_geometry_get(tb, 2, &x[4], &y[4], 
&w2[4], &h2[4]);
 
       // check line 1 geometry relatively to line 0
-      fail_if((x[2] != x[3]) || ((y[2] + h[2]) != y[3]) || (w[2] != w[3]) || 
(h[2] != h[3]));
+      fail_if((x[2] != x[3]) || ((y[2] + h2[2]) != y[3]) || (w2[2] != w2[3]) 
|| (h2[2] != h2[3]));
 
       // check padding is correct
       fail_if((x[2] != (x[0] + l)) || (y[2] != (y[0] + t)));
 
       // line 2 should not suffer from padding in line 1, as it is globally 
applied
-      fail_if((x[4] != x[2]) || ((y[2] + h[2] + h[3]) != y[4]));
+      fail_if((x[4] != x[2]) || ((y[2] + h2[2] + h2[3]) != y[4]));
    }
 
    /* No font */

--