From a92bc9ec9f8ac49bc2bb5403434d5d52f730d96e Mon Sep 17 00:00:00 2001 From: devilhorns Date: Sun, 24 Jan 2010 19:59:35 +0000 Subject: [PATCH] Fix remaining "shadowed declaration" warnings. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@45528 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/eina_fp.c | 32 ++++++++++++++++---------------- src/lib/eina_rectangle.c | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lib/eina_fp.c b/src/lib/eina_fp.c index d9ec9ba..264e972 100644 --- a/src/lib/eina_fp.c +++ b/src/lib/eina_fp.c @@ -126,7 +126,7 @@ eina_f32p32_cos(Eina_F32p32 a) Eina_F32p32 remainder_PI; Eina_F32p32 interpol; Eina_F32p32 result; - int index; + int idx; int index2; F32P32_2PI = EINA_F32P32_PI << 1; @@ -144,16 +144,16 @@ eina_f32p32_cos(Eina_F32p32 a) interpol = eina_f32p32_div(eina_f32p32_scale(remainder_PI, MAX_PREC * 2), EINA_F32P32_PI); - index = eina_f32p32_int_to(interpol); - if (index >= MAX_PREC) - index = 2 * MAX_PREC - (index - 1); + idx = eina_f32p32_int_to(interpol); + if (idx >= MAX_PREC) + idx = 2 * MAX_PREC - (idx - 1); - index2 = index + 1; + index2 = idx + 1; if (index2 == MAX_PREC) - index2 = index - 1; + index2 = idx - 1; - result = eina_f32p32_add(eina_trigo[index], - eina_f32p32_mul(eina_f32p32_sub(eina_trigo[index], + result = eina_f32p32_add(eina_trigo[idx], + eina_f32p32_mul(eina_f32p32_sub(eina_trigo[idx], eina_trigo[index2]), (Eina_F32p32) eina_f32p32_fracc_get(interpol))); @@ -177,7 +177,7 @@ eina_f32p32_sin(Eina_F32p32 a) Eina_F32p32 remainder_PI; Eina_F32p32 interpol; Eina_F32p32 result; - int index; + int idx; int index2; F32P32_2PI = EINA_F32P32_PI << 1; @@ -198,16 +198,16 @@ eina_f32p32_sin(Eina_F32p32 a) interpol = eina_f32p32_div(eina_f32p32_scale(remainder_PI, MAX_PREC * 2), EINA_F32P32_PI); - index = eina_f32p32_int_to(interpol); - if (index >= MAX_PREC) - index = MAX_PREC - (index + 1); + idx = eina_f32p32_int_to(interpol); + if (idx >= MAX_PREC) + idx = MAX_PREC - (idx + 1); - index2 = index + 1; + index2 = idx + 1; if (index2 == MAX_PREC) - index2 = index - 1; + index2 = idx - 1; - result = eina_f32p32_add(eina_trigo[index], - eina_f32p32_mul(eina_f32p32_sub(eina_trigo[index], + result = eina_f32p32_add(eina_trigo[idx], + eina_f32p32_mul(eina_f32p32_sub(eina_trigo[idx], eina_trigo[index2]), (Eina_F32p32) eina_f32p32_fracc_get(interpol))); diff --git a/src/lib/eina_rectangle.c b/src/lib/eina_rectangle.c index 5748ce9..0bb55a1 100644 --- a/src/lib/eina_rectangle.c +++ b/src/lib/eina_rectangle.c @@ -196,30 +196,30 @@ _eina_rectangle_empty_space_find(Eina_List *empty, int w, int h, int *x, int *y) } else { - int x1, y1, w1, h1; + int rx1, ry1, rw1, rh1; int x2, y2, w2, h2; - x1 = r->x + w; - y1 = r->y; - w1 = r->w - w; + rx1 = r->x + w; + ry1 = r->y; + rw1 = r->w - w; /* h1 could be h or r->h */ x2 = r->x; y2 = r->y + h; /* w2 could be w or r->w */ h2 = r->h - h; - if (w1 * r->h > h2 * r->w) + if (rw1 * r->h > h2 * r->w) { - h1 = r->h; + rh1 = r->h; w2 = w; } else { - h1 = h; + rh1 = h; w2 = r->w; } - EINA_RECTANGLE_SET(r, x1, y1, w1, h1); + EINA_RECTANGLE_SET(r, rx1, ry1, rw1, rh1); empty = _eina_rectangle_merge_list(empty, r); r = eina_rectangle_new(x2, y2, w2, h2); -- 2.7.4